diff --git a/acatcher/mkacatcher_cpp.sh b/acatcher/mkacatcher_cpp.sh
index c5617cd..212fabf 100755
--- a/acatcher/mkacatcher_cpp.sh
+++ b/acatcher/mkacatcher_cpp.sh
@@ -7,24 +7,18 @@ if [ ! -f "$1" ]; then
 fi
 
 NUM=0
-while read FOO; do
-  if ! echo $FOO | grep -q ^#; then
+while read HOST; do
+  FOO="`grep $HOST\$ MASTER_LIST`"
+  if [ ! -z "$FOO" ]; then
     HOST="`echo $FOO | cut -d\| -f3`"
     MAC="`echo $FOO | cut -d\| -f1 | tr '[A-Z]' '[a-z]'`"
     IP="`echo $FOO | cut -d\| -f2`"
-    if ! echo $HOST | egrep -q "server"; then
-      if grep -q "^$HOST\$" "$1" ; then
-        >&2 echo found host $HOST mac $MAC ip $IP num $NUM
-        HEX="`echo "obase=16; $NUM" | bc | tr '[A-Z]' '[a-z]'`"
-        echo "\"[$HEX] $HOST\","
-        NUM=$((NUM+1))
-      fi
-    elif echo $HOST | grep -q server; then
-      >&2 echo found server at ip $IP
-      echo $IP > SERVERIP
-    fi
+    >&2 echo found host $HOST mac $MAC ip $IP num $NUM
+    HEX="`echo "obase=16; $NUM" | bc | tr '[A-Z]' '[a-z]'`"
+    echo "\"[$HEX] $HOST\","
+    NUM=$((NUM+1))
   fi
-done < MASTER_LIST > acatcher.cxx.inc
+done < "$1" > acatcher.cxx.inc
 
 sed -e "s/_NUMHOSTS_/$NUM/" -e '/_HOSTS_/ {' -e 'r acatcher.cxx.inc' -e 'd' -e '}' < acatcher.cxx.template > acatcher.cxx
 
diff --git a/acatcher/start_watcher.sh b/acatcher/start_watcher.sh
index 97d6c81..715e961 100755
--- a/acatcher/start_watcher.sh
+++ b/acatcher/start_watcher.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #FLAGS="-a"
 FLAGS="-as"
-STRACE=""
-#STRACE="strace -o TRACE"
+#STRACE=""
+STRACE="strace -o TRACE"
 
 clear
 echo -ne "\033]0;CONTROL\007"