diff --git a/setup/a2chat.txt b/setup/a2chat.txt
index 79536dd..8648143 100644
--- a/setup/a2chat.txt
+++ b/setup/a2chat.txt
@@ -30,7 +30,10 @@ echo $nickname > ~/.irssi/a2c.nickname
 if [[ -f ~/.irssi/startup ]]; then
     mv ~/.irssi/startup ~/.irssi/startup.orig
 fi
-echo -e "/network add -autosendcmd '/join #a2c.chat' Palomino.A2\n/server add -auto -network Palomino.A2 irc.a2central.com\n" > ~/.irssi/startup
+# SOME broken versions of bash have an intentionally broken
+# echo -e for no justifiable reason.  Yes I mean YOU, Apple!
+echo "/network add -autosendcmd '/join #a2c.chat' Palomino.A2
+/server add -auto -network Palomino.A2 irc.a2central.com\n" > ~/.irssi/startup
 
 if [[ -f ~/.irssi/config ]]; then
     cp ~/.irssi/config ~/.irssi/config.orig
diff --git a/setup/acmd.txt b/setup/acmd.txt
index dfe66aa..4e349cb 100644
--- a/setup/acmd.txt
+++ b/setup/acmd.txt
@@ -9,7 +9,7 @@ decToHex () {
     [[ $arg1 ]] || return 11
     [[ $2 ]] && return 8
     [[ ( $(printf %d "$arg1" 2> /dev/null) == $arg1 ) \
-     && ( $arg1 -ge 0 ) && ( $arg1 -le 255 ) ]] || return 21
+        && ( $arg1 -ge 0 ) && ( $arg1 -le 255 ) ]] || return 21
     # args are valid
     printf %02X "$arg1"
 }
diff --git a/setup/adtpro.sh.txt b/setup/adtpro.sh.txt
index 0b35946..b060cad 100644
--- a/setup/adtpro.sh.txt
+++ b/setup/adtpro.sh.txt
@@ -99,16 +99,16 @@ fi
 
 # For OSX, use this:
 if [ "$OS" = "Darwin" ]; then
-  if [ "$OS_ARCH" = "powerpc" ]; then
-    export RXTXLIB=lib/rxtx/rxtx-2.1-7-bins-r2/Mac_OS_X
-  else
-    export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/mac-10.5
-  fi
+    if [ "$OS_ARCH" = "powerpc" ]; then
+        export RXTXLIB=lib/rxtx/rxtx-2.1-7-bins-r2/Mac_OS_X
+    else
+        export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/mac-10.5
+    fi
 fi
 
 # For Solaris, use this:
 if [ "$OS" = "SunOS" ]; then
-  export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/sparc-sun-solaris2.10-32
+    export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/sparc-sun-solaris2.10-32
 fi
 
 # Set up the library location.
@@ -116,18 +116,18 @@ export TWEAK1="-Djava.library.path="
 export TWEAK=$TWEAK1$ADTPRO_HOME/$RXTXLIB
 
 if [[ $headless ]]; then
-  if [[ ! $1 || ! -f /usr/bin/xvfb-run ]]; then
-    if [[ ! -f /usr/bin/xvfb-run ]]; then
-      echo "Headless operation requires xvfb."
-      usageExit
+    if [[ ! $1 || ! -f /usr/bin/xvfb-run ]]; then
+        if [[ ! -f /usr/bin/xvfb-run ]]; then
+            echo "Headless operation requires xvfb."
+            usageExit
+        else
+            echo "Headless operation requires a communication mode (e.g. serial)."
+            usageExit
+        fi
+        exit 1
     else
-      echo "Headless operation requires a communication mode (e.g. serial)."
-      usageExit
+        HEADLESS="xvfb-run --auto-servernum "
     fi
-    exit 1
-  else
-    HEADLESS="xvfb-run --auto-servernum "
-  fi
 fi
 
 if [[ $serialPortName && $(ps aux | grep "/sbin/getty.*$serialPortName") ]]; then
diff --git a/setup/cppo.txt b/setup/cppo.txt
index 0e93f1b..102d59c 100644
--- a/setup/cppo.txt
+++ b/setup/cppo.txt
@@ -881,4 +881,3 @@ else:
     processDir(2)
     if not g.DIR:
         syncExit()
-
diff --git a/setup/gsport.txt b/setup/gsport.txt
index 9016366..476b4aa 100644
--- a/setup/gsport.txt
+++ b/setup/gsport.txt
@@ -52,6 +52,7 @@ else
             if [[ $REPLY == "ok" || $REPLY == "ok" || $REPLY == "Ok" ]]; then
                 sudo touch /usr/local/etc/gsportconsolewarningoff
             fi
+            # FIXME: Should this block just be deleted at this point?
 #             echo "If you wish to run GSport in the console window, the mouse will not work"
 #             echo "unless you uninstall VirtualBox Guest Additions. If you don't want to do"
 #             echo "this, you can instead run GSport in an X window (e.g. by typing 'startx')."
diff --git a/setup/raspbian-update.txt b/setup/raspbian-update.txt
index 9b1be12..c1552ba 100644
--- a/setup/raspbian-update.txt
+++ b/setup/raspbian-update.txt
@@ -45,11 +45,11 @@ done
 noobs=
 readarray -t partitions < <(sudo fdisk -l | grep '^/dev')
 if [[ \
-  ${partitions[0]:0:14} == "/dev/mmcblk0p1" && ${partitions[0]:57:2} == " e" &&
-  ${partitions[1]:0:14} == "/dev/mmcblk0p2" && ${partitions[1]:57:2} == "85" &&
-  ${partitions[2]:0:14} == "/dev/mmcblk0p3" && ${partitions[2]:57:2} == "83" &&
-  ${partitions[3]:0:14} == "/dev/mmcblk0p5" && ${partitions[3]:57:2} == " c" &&
-  ${partitions[4]:0:14} == "/dev/mmcblk0p6" && ${partitions[4]:57:2} == "83" ]]; then
+    ${partitions[0]:0:14} == "/dev/mmcblk0p1" && ${partitions[0]:57:2} == " e" &&
+    ${partitions[1]:0:14} == "/dev/mmcblk0p2" && ${partitions[1]:57:2} == "85" &&
+    ${partitions[2]:0:14} == "/dev/mmcblk0p3" && ${partitions[2]:57:2} == "83" &&
+    ${partitions[3]:0:14} == "/dev/mmcblk0p5" && ${partitions[3]:57:2} == " c" &&
+    ${partitions[4]:0:14} == "/dev/mmcblk0p6" && ${partitions[4]:57:2} == "83" ]]; then
     noobs=" and the NOOBS install manager"
 fi