diff --git a/data/wicd.glade b/data/wicd.glade
index e5a9d7f..9ad771a 100644
--- a/data/wicd.glade
+++ b/data/wicd.glade
@@ -456,6 +456,7 @@
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">6</property>
                                 <property name="bottom_attach">7</property>
+                                <property name="y_options"></property>
                               </packing>
                             </child>
                             <child>
diff --git a/in/scripts=wicd-client.in b/in/scripts=wicd-client.in
index f535254..49288fc 100755
--- a/in/scripts=wicd-client.in
+++ b/in/scripts=wicd-client.in
@@ -1,10 +1,10 @@
 #!/bin/bash
-BOLD=`tput bold`
-BLUE=`tput setaf 4`
-NC=`tput sgr0`
+BOLD=$(tput bold)
+BLUE=$(tput setaf 4)
+NC=$(tput sgr0)
 # check_firstrun()
 if [ ! -d ~/.wicd ]; then
-    mkdir ~/.wicd
+    mkdir -p ~/.wicd
 fi
 # Make sure the user knows WHEREAREMYFILES ;-)
 if [ -e %DOCDIR%WHEREAREMYFILES ] && [ ! -L ~/.wicd/WHEREAREMYFILES ]; then
@@ -12,34 +12,23 @@ if [ -e %DOCDIR%WHEREAREMYFILES ] && [ ! -L ~/.wicd/WHEREAREMYFILES ]; then
 fi
 if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then
     if [ ! -f ~/.wicd/CLIENT_CURSES_WARNING ]; then
-        echo "NOTICE: We see that you don't have an X server active on this console."
-        echo "We will now be starting ${BOLD}${BLUE}wicd-curses${NC}.  If you desire"
-        echo "more information about what is happening here, please read:"
-        echo 
-        echo "man wicd-client"
-        echo "-or-"
-        echo "man wicd-curses"
-        echo
-        echo "We apologize for any inconvenience.  This message will not be displayed again."
-        echo "Please press enter to continue..."
+        printf "NOTICE: You do not have an X server active on this console, \n"
+        printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n"
+        printf "Please see the wicd-client and/or wicd-curses manual pages \n"
+        printf "for more information about this error and resulting message. \n"
+        printf "\n" 
+        printf "This message will not be displayed again. \n"
+        printf "Press enter to continue... \n"
 
-        read junk
-        cat >>~/.wicd/CLIENT_CURSES_WARNING<<EOF 
-This file is what wicd-client looks for so that it doesn't try to tell you that
-it is trying to launch the curses client so that it doesn't surprise non-
-technical users.
+        read _junk
+        cat >> ~/.wicd/CLIENT_CURSES_WARNING << EOF 
+The wicd-client script checks for the existence of this file to determine
+whether it should warn the user before launching wicd-curses instead, in 
+the event of the gui client being launched outside of the X Window environment.
 
-Please keep this file.  If you remove it, then wicd-client will bark at
-you if you try to launch wicd-client on a screen that is not running X.
-
-Or, you could just run "touch ~/.wicd/CLIENT_CURSES_WARNING", and the same
-objective will be met.
-
-Have a nice day.
-
-~The Wicd Developers
+If you delete this file, then wicd-client will print the warning if it is 
+launched outside of X (and then recreate this file again).
 EOF
-        #touch ~/.wicd/CLIENT_CURSES_WARNING
     fi
     exec %BIN%wicd-curses
 fi
diff --git a/man/wicd-client.1 b/man/wicd-client.1
index 115217c..9925b0c 100644
--- a/man/wicd-client.1
+++ b/man/wicd-client.1
@@ -4,7 +4,9 @@ wicd-client \- manual page for wicd-client
 .SH DESCRIPTION
 wireless (and wired) connection daemon front\-end.
 
-If wicd-curses(8) is instaled, and you attempt to run wicd-client without an active X server on the current terminal, wicd-client will attempt to run wicd-curses(8) instead.  It will warn you the first time this happens.
+If wicd-curses(8) is installed, and you attempt to run wicd-client without 
+an active X server on the current terminal, wicd-client will attempt to run 
+wicd-curses(8) instead.  It will warn you the first time this happens.
 .SS "Arguments:"
 .TP
 \fB\-n\fR      \fB\-\-no\-tray\fR
diff --git a/setup.py b/setup.py
index f049b14..82de34d 100755
--- a/setup.py
+++ b/setup.py
@@ -155,6 +155,8 @@ class configure(Command):
         elif os.path.exists('/etc/pld-release'):
             self.init = '/etc/rc.d/init.d/'
             self.initfile = 'init/pld/wicd'
+        elif os.path.exists('/usr/bin/crux'):
+            self.init = '/etc/rc.d/'
         else:
             self.init = 'FAIL'
             self.initfile = 'FAIL'