diff --git a/ChangeLog b/ChangeLog
index 152dcfb..0a11ca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 	- Move some of the config clutter to conf/ - you can
 	  put your config files anywhere, but by default, they're
 	  now going to be in conf/
+	- Beginning work on configuration tool.  If it ever
+	  gets completed is a whole different story.  :)
 
 0.9.10 - Brielle Bruns <bruns@2mbit.com>
 	- Move clamp mss up earlier in the rules to possibly
diff --git a/tools/configure-firewall b/tools/configure-firewall
index d6c238b..4429c01 100755
--- a/tools/configure-firewall
+++ b/tools/configure-firewall
@@ -47,10 +47,10 @@ if ! ( $WHIPTAIL --title "${TOOL_TITLE}" --yesno "${WELCOME_BODY}" 12 70 --no-bu
 	exit 1
 fi
 
-if [ -w $TMPCONFIG ]; then
+if [ -w "$TMPCONFIG" ]; then
 	echo "# Automatically generated config file, please check before actually using." >"${TMPCONFIG}"
 else
-	echo "Error: could not write tmp file for config generation!"
+	echo "Error: could not write tmp file for config generation."
 	exit 1
 fi
 
@@ -60,18 +60,23 @@ if ( $WHIPTAIL --title "${TOOL_TITLE}" --yesno "${AUTOCONFIG_PATHS}" 10 40 ); th
 		IFS_OLD=${IFS};IFS=:
 		BIN_PATH=($i)
 		IFS=${IFS_OLD}
-		if ( ${WHICH} ${BIN_PATH[0]}&>/dev/null ); then
+		if ( ${WHICH} ${BIN_PATH[0]} &>/dev/null ); then
 			BIN_FULL="`${WHICH} ${BIN_PATH[0]}`"
 			echo "${BIN_PATH[1]}=\"${BIN_FULL}\"" >>"${TMPCONFIG}"
 		else
-			FAILED_CMD_PATH="${FAILED_CMD_PATH} ${BIN_PATH[0]"
-			echo "\#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
+			FAILED_CMD_PATH="${FAILED_CMD_PATH} ${BIN_PATH[0]}"
+			echo "#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
 		fi
 	done
 	if [ "$FAILED_CMD_PATH" ]; then
 		$WHIPTAIL --title "${TOOL_TITLE}" --msgbox "${FAILED_BINS}\n${FAILED_CMD_PATH}\n${FAILED_BINS_FOOT}" 10 60
 	fi
-#
-#else
+else
+	for i in $AUTOCONFIG_BIN; do
+		IFS_OLD=${IFS};IFS=:
+		BIN_PATH=($i)
+		IFS=${IFS_OLD}
+		echo "#${BIN_PATH[1]}=\"\"" >>"${TMPCONFIG}"
 fi
-	
+
+