diff --git a/todo b/todo
index d9a155582b..642ea052d6 100755
--- a/todo
+++ b/todo
@@ -21,8 +21,7 @@ BUGS (arranged from high to low priority)
 - Win GUI: columns expand when window expands
 - Download speed is not as fast as it should be
 - Result status should say "downloading files", "uploading files", etc.
-- Change vector removal routines to use an iterator
-- Download progress doesn't update fast enough (is this b/c of buffered disk writing?)
+- Download progress doesn't update fast enough/at all on Win9x (is this b/c of buffered disk writing?)
 
 -----------------------
 HIGH-PRIORITY (should do for beta test)
@@ -31,6 +30,8 @@ HIGH-PRIORITY (should do for beta test)
 Check for problematic HTML tags in team descriptions
     (use SETI@home code?)
 
+implement server watchdogs
+
 make get_local_ip_addr() work in all cases
 
 est_time_to_completion doesn't work for non-running tasks
@@ -75,7 +76,6 @@ Figure out how to support people with computers at home/work
 
 Add 2-D waterfall display to Astropulse
 
-protect project admin web pages (htaccess)
 get timezone working on all platforms
 
 Deadline mechanism for results
@@ -91,7 +91,6 @@ Testing framework
 Delete files if needed to honor disk usage constraint
     inform user if this happens
 
-
 Global preferences
     implement disk usage prefs
     time-of-day prefs?
@@ -124,8 +123,6 @@ CPU benchmarking
 CPU accounting in the presence of checkpoint/restart
     test
 
-Test nslots > 1
-
 Redundancy checking and validation
     test the validation mechanism
     make sure credit is granted correctly