diff --git a/doc/todo.txt b/doc/todo.txt
new file mode 100644
index 0000000..3226be8
--- /dev/null
+++ b/doc/todo.txt
@@ -0,0 +1,4 @@
+Things That Need Fixin'
+=======================
+
+* puzzles.cgi really needs to cross out points your team has claimed.
diff --git a/mcp/bin/teams.sh b/mcp/bin/teams.sh
index cabafe1..86bd6e3 100755
--- a/mcp/bin/teams.sh
+++ b/mcp/bin/teams.sh
@@ -20,7 +20,7 @@ cat <<EOF
 EOF
 
 echo "<table>"
-echo "<tr><th>Team Name</th><th>Token</th></tr>"
+echo "<tr><th>Team</th><th>ID</th></tr>"
 for i in *; do
     echo "<tr><td>"
     escape < $i
@@ -29,7 +29,10 @@ done
 echo "</table>"
 
 cat <<EOF
-  <p>Use your team's token to claim points.</p>
+  <p>
+    Team names are only used on this page and the scoreboard.
+    Use your team ID to claim points.
+  </p>
   </body>
 </html>
 EOF
diff --git a/mcp/service/puzzled/run b/mcp/service/puzzled/run
index 8a13252..b117138 100755
--- a/mcp/service/puzzled/run
+++ b/mcp/service/puzzled/run
@@ -2,6 +2,9 @@
 
 exec 2>&1
 
+# Give everybody a chance to mount
+sleep 5
+
 # Make an initial listing
 ./puzzled
 
diff --git a/mcp/setup b/mcp/setup
index f028202..03ac22a 100755
--- a/mcp/setup
+++ b/mcp/setup
@@ -4,6 +4,7 @@
 
 hostname mcp
 
+
 cp -r service/* /var/service/
 cp -r www /var/
 
diff --git a/mcp/src/puzzler.cgi.c b/mcp/src/puzzler.cgi.c
index 7fbc6ca..4c71c5c 100644
--- a/mcp/src/puzzler.cgi.c
+++ b/mcp/src/puzzler.cgi.c
@@ -76,7 +76,8 @@ main(int argc, char *argv[])
   }
 
   cgi_page("Points awarded",
-           ("<p>%d points for %s.</p>"
+           ("<p>%d points for %s.</p>\n"
+            "<p><a href=\"/puzzles.html\">Back to puzzles</a></p>\n"
             "<!-- awarded %d -->"),
            points, team, points);
 
diff --git a/mcp/src/puzzles.cgi.c b/mcp/src/puzzles.cgi.c
index f3daab7..8edf29d 100644
--- a/mcp/src/puzzles.cgi.c
+++ b/mcp/src/puzzles.cgi.c
@@ -59,7 +59,7 @@ main(int argc, char *argv[])
   }
 
   {
-    FILE *f = fopen(state_path("puzzler.db"), "r");
+    FILE *f = fopen(state_path("puzzles.db"), "r");
     char  cat[CAT_MAX];
     char  points_str[11];
     long  points;
diff --git a/puzzles/puzzles.mk b/puzzles/puzzles.mk
index 50a3c0b..92185ce 100644
--- a/puzzles/puzzles.mk
+++ b/puzzles/puzzles.mk
@@ -1,4 +1,5 @@
-PUZZLES = sequence codebreaking
+PUZZLES += basemath bletchley codebreaking compaq crypto
+PUZZLES += forensics hackme net-re sequence skynet webapp
 
 -include puzzles/*/*.mk