diff --git a/packages/ctfbase/service/ctfd/ctfd b/packages/ctfbase/service/ctfd/ctfd
index 11e724e..84f2bc8 100755
--- a/packages/ctfbase/service/ctfd/ctfd
+++ b/packages/ctfbase/service/ctfd/ctfd
@@ -1,4 +1,6 @@
-#! /bin/sh
+#! /bin/sh -e
+
+PATH=/bin:/opt/ctfbase/bin; export PATH
 
 while true; do
     # Get new tokens
@@ -7,8 +9,8 @@ while true; do
         puzzle=$(basename $dn)
         category=$(cat $dn/category)
         busybox nc 10.0.0.2 1 \
-            -e /opt/tokens/bin/tokencli $category $dn/category.key 3>&1 | \
-            /opt/tokens/bin/arc4 $dn/enc.key > /var/lib/ctf/tokens/$puzzle
+            -e tokencli $category $dn/category.key 3>&1 | \
+            arc4 $dn/enc.key > /var/lib/ctf/tokens/$puzzle
     done
 
     # Fetch list of teams
diff --git a/packages/ctfbase/service/ctfd/log/run b/packages/ctfbase/service/ctfd/log/run
index b9dfae2..d9d6355 100755
--- a/packages/ctfbase/service/ctfd/log/run
+++ b/packages/ctfbase/service/ctfd/log/run
@@ -1,3 +1,4 @@
 #! /bin/sh
 
-exec logger -t tokencli
+exec svlogd -tt $PWD
+
diff --git a/packages/ircd/service/ircd/log/run b/packages/ircd/service/ircd/log/run
index e680a08..1e7bd9d 100755
--- a/packages/ircd/service/ircd/log/run
+++ b/packages/ircd/service/ircd/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t ircd
+exec svlogd -tt $PWD
diff --git a/packages/logger/service/logger/log/run b/packages/logger/service/logger/log/run
index 4dc546f..1e7bd9d 100755
--- a/packages/logger/service/logger/log/run
+++ b/packages/logger/service/logger/log/run
@@ -1,4 +1,3 @@
 #! /bin/sh
 
-# I'm sorry this is confusing.
-exec logger -t logger
+exec svlogd -tt $PWD
diff --git a/packages/logger/service/logger/run b/packages/logger/service/logger/run
index f0bf6ab..2e36c15 100755
--- a/packages/logger/service/logger/run
+++ b/packages/logger/service/logger/run
@@ -3,4 +3,4 @@
 exec 2>&1
 IP=$(cat ip.txt)
 ip addr add $IP label eth0:logger dev eth0
-exec tcpsvd ${IP#/*} 1958 /opt/logger/bin/logger
+exec tcpsvd ${IP%/*} 1958 /opt/logger/bin/logger
diff --git a/packages/mcp/bin/addteam b/packages/mcp/bin/addteam
index f2773d1..6a335a3 100755
--- a/packages/mcp/bin/addteam
+++ b/packages/mcp/bin/addteam
@@ -1,5 +1,7 @@
 #! /bin/sh -e
 
+PATH=/bin:/opt/ctfbase/bin
+
 if [ $# -ne 1 ]; then
     echo "Usage: $0 TEAM" 1>&2
     exit 64
@@ -51,5 +53,5 @@ echo "$color" > $base/teams/colors/$hash
 echo "Registered with hash: $hash"
 
 # Create encrypted listing of teams
-ls $base/teams/names | KEY="Too much cheese." /opt/mcp/bin/arc4 > $www/teams.txt.$$
+ls $base/teams/names | KEY="Too much cheese." arc4 > $www/teams.txt.$$
 mv $www/teams.txt.$$ $www/teams.txt
diff --git a/packages/mcp/service/httpd/log/run b/packages/mcp/service/httpd/log/run
index ff6d84c..1e7bd9d 100755
--- a/packages/mcp/service/httpd/log/run
+++ b/packages/mcp/service/httpd/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t httpd
+exec svlogd -tt $PWD
diff --git a/packages/mcp/service/pointsd/log/run b/packages/mcp/service/pointsd/log/run
index 90a73e6..1e7bd9d 100755
--- a/packages/mcp/service/pointsd/log/run
+++ b/packages/mcp/service/pointsd/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t mcp
+exec svlogd -tt $PWD
diff --git a/packages/mcp/service/puzzled/log/run b/packages/mcp/service/puzzled/log/run
index 1fd1929..1e7bd9d 100755
--- a/packages/mcp/service/puzzled/log/run
+++ b/packages/mcp/service/puzzled/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t puzzles
+exec svlogd -tt $PWD
diff --git a/packages/mcp/service/tokend/log/run b/packages/mcp/service/tokend/log/run
index 404f1ce..1e7bd9d 100755
--- a/packages/mcp/service/tokend/log/run
+++ b/packages/mcp/service/tokend/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t tokend
+exec svlogd -tt $PWD
diff --git a/packages/octopus/service/octopus-redirect/run b/packages/octopus/service/octopus-redirect/run
index f404009..b8764c9 100755
--- a/packages/octopus/service/octopus-redirect/run
+++ b/packages/octopus/service/octopus-redirect/run
@@ -2,4 +2,4 @@
 
 IP=$(cat ../octopus/ip.txt)
 sv s octopus >/dev/null || exit 1
-exec tcpsvd ${IP#/*} 8888 ./octopus-redirect
+exec tcpsvd ${IP%/*} 8888 ./octopus-redirect
diff --git a/packages/octopus/service/octopus/log/run b/packages/octopus/service/octopus/log/run
index 049ab8e..1e7bd9d 100755
--- a/packages/octopus/service/octopus/log/run
+++ b/packages/octopus/service/octopus/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t octopus
+exec svlogd -tt $PWD
diff --git a/packages/printf/service/printf/log/run b/packages/printf/service/printf/log/run
index 6be042c..1e7bd9d 100755
--- a/packages/printf/service/printf/log/run
+++ b/packages/printf/service/printf/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t printf
+exec svlogd -tt $PWD
diff --git a/packages/printf/service/printf/run b/packages/printf/service/printf/run
index 57de4a7..331b959 100755
--- a/packages/printf/service/printf/run
+++ b/packages/printf/service/printf/run
@@ -11,4 +11,4 @@ ip addr add $IP label eth0:printf dev eth0
 # And he says, "how about 9001, because that's bigger than 9000"
 # Okay.
 
-exec tcpsvd ${IP#/*} 9001 ./run-printf
+exec tcpsvd ${IP%/*} 9001 ./run-printf
diff --git a/packages/pwnables/service/pwnables/log/run b/packages/pwnables/service/pwnables/log/run
index c356994..1e7bd9d 100755
--- a/packages/pwnables/service/pwnables/log/run
+++ b/packages/pwnables/service/pwnables/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t pwnables
+exec svlogd -tt $PWD
diff --git a/packages/pwnables/service/pwnables/run b/packages/pwnables/service/pwnables/run
index 42cdbe5..27fb1de 100755
--- a/packages/pwnables/service/pwnables/run
+++ b/packages/pwnables/service/pwnables/run
@@ -39,4 +39,4 @@ for puzzle in gimmie ltraceme straceme killme; do
     ln -sf /mnt/pwnables-root/var/lib/ctf/tokens/$puzzle /var/lib/ctf/tokens/$puzzle
 done
 
-exec tcpsvd -C 5:"Let's not be greedy" 0 23 /sbin/telnetd -l ./pwnie
+exec tcpsvd -C 5:"Let's not be greedy" ${IP%/*} 23 /sbin/telnetd -l ./pwnie
diff --git a/packages/rlyeh/service/rlyeh/run b/packages/rlyeh/service/rlyeh/run
index 40644a0..b8f8962 100755
--- a/packages/rlyeh/service/rlyeh/run
+++ b/packages/rlyeh/service/rlyeh/run
@@ -7,4 +7,4 @@ ip addr add $IP label eth0:rlyeh dev eth0
 dir=/var/lib/ctf/rlyeh
 install -o nobody -d $dir
 
-exec setuidgid nobody tcpsvd ${IP#/*} 1928 ./rlyeh-ctf
+exec setuidgid nobody tcpsvd ${IP%/*} 1928 ./rlyeh-ctf
diff --git a/packages/sshd/service/sshd/log/run b/packages/sshd/service/sshd/log/run
index 4794c8e..1e7bd9d 100755
--- a/packages/sshd/service/sshd/log/run
+++ b/packages/sshd/service/sshd/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t sshd
+exec svlogd -tt $PWD
diff --git a/packages/tanks/service/tanksd/log/run b/packages/tanks/service/tanksd/log/run
index c4eff97..1e7bd9d 100755
--- a/packages/tanks/service/tanksd/log/run
+++ b/packages/tanks/service/tanksd/log/run
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec logger -t tanks
+exec svlogd -tt $PWD