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