diff --git a/client/Makefile.in b/client/Makefile.in
index b500932757..b607808cfb 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -21,7 +21,7 @@ CC = @CC@ $(CFLAGS)
 CLIBS = @LIBS@
 
 CLIENT_PROG = boinc_$(BOINC_MAJOR_VERSION).$(BOINC_MINOR_VERSION)_@host@
-PROGS = $(CLIENT_PROG) test_net_xfer test_http test_file_xfer
+PROGS = $(CLIENT_PROG)
 
 all: $(PROGS)
 
@@ -102,15 +102,6 @@ speed_stats.o:
 $(CLIENT_PROG): main.o $(OBJS)
 	$(CC) main.o $(OBJS) $(CLIBS) -o $(CLIENT_PROG)
 
-test_net_xfer: test_net_xfer.o $(TEST_NET_XFER_OBJS)
-	$(CC) test_net_xfer.o $(TEST_NET_XFER_OBJS) $(CLIBS) -o test_net_xfer
-
-test_http: test_http.o $(TEST_HTTP_OBJS)
-	$(CC) test_http.o $(TEST_HTTP_OBJS) $(CLIBS) -o test_http
-
-test_file_xfer: test_file_xfer.o $(TEST_FX_OBJS)
-	$(CC) test_file_xfer.o $(TEST_FX_OBJS) $(CLIBS) -o test_file_xfer
-
 tar:
 	cd $(topsrcdir)/..; \
 	tar cf boinc_client_$(BOINC_MAJOR_VERSION).$(BOINC_MINOR_VERSION).tar $(ARCHIVE_TARGETS); \
@@ -127,9 +118,6 @@ clean:
 
 install: all
 	-mkdir -p $(INSTALL_DIR)/client
-	cp test_net_xfer $(INSTALL_DIR)/client/test_net_xfer
-	cp test_http $(INSTALL_DIR)/client/test_http
-	cp test_file_xfer $(INSTALL_DIR)/client/test_file_xfer
 	cp $(CLIENT_PROG) $(INSTALL_DIR)/client/$(CLIENT_PROG)
 
 uninstall:
diff --git a/client/app.C b/client/app.C
index d3649710da..6821bc86c7 100644
--- a/client/app.C
+++ b/client/app.C
@@ -170,7 +170,9 @@ int ACTIVE_TASK::start(bool first_time) {
         return ERR_FOPEN;
     }
 #ifdef HAVE_SYS_IPC_H
-    aid.shm_key = ftok( init_data_path, slot );
+    aid.shm_key = ftok(init_data_path, slot);
+#else
+#error
 #endif
     retval = write_init_data_file(f, aid);
     if (retval) return retval;
diff --git a/client/net_xfer.C b/client/net_xfer.C
index eae178a560..ab673de0da 100644
--- a/client/net_xfer.C
+++ b/client/net_xfer.C
@@ -64,6 +64,8 @@
 #include "log_flags.h"
 #include "net_xfer.h"
 #include "util.h"
+#include "client_types.h"
+#include "message.h"
 
 //  If socklen_t isn't defined, define it here as size_t
 #if !defined(socklen_t)
@@ -72,13 +74,15 @@
 
 int NET_XFER::get_ip_addr( char *hostname, int &ip_addr ) {
     hostent* hep;
+    char buf[256];
 
 #ifdef _WIN32
     if(NetOpen()) return -1;
 #endif
     hep = gethostbyname(hostname);
     if (!hep) {
-        fprintf(stderr, "can't resolve hostname %s\n", hostname);
+        sprintf(buf, "can't resolve hostname %s\n", hostname);
+        show_message(0, buf, MSG_ERROR);
 #ifdef _WIN32
         NetClose();
 #endif
@@ -364,7 +368,7 @@ int NET_XFER_SET::do_select(double& bytes_transferred, timeval& timeout) {
             if (nxp) {
                 nxp->got_error();
             } else {
-                fprintf(stderr, "do_select(): nxp not found\n");
+                show_message(0, "do_select(): nxp not found\n", MSG_ERROR);
             }
         }
     }
diff --git a/doc/index.html b/doc/index.html
index 964fd68c2d..1a4f075283 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -53,7 +53,7 @@ Help debug and enhance the BOINC software.
 <a href=http://www.equn.com/boinchina><font size=-1>Chinese</font></a>
 <a href=http://www.boinc-fr.net><font size=-1>French</font></a>
 <a href=http://www.boinc.de/><font size=-1>German</font></a>
-<a href=http://www.boinc.pisem.net><font size=-1>Russian</font></a>
+<a href=http://www.boinc.narod.ru><font size=-1>Russian</font></a>
 <a href=http://boinc.astroseti.org><font size=-1>Spanish</font></a>
 
 <br><br>
diff --git a/doc/single_host_server.html b/doc/single_host_server.html
index abb7cce190..5361494d04 100644
--- a/doc/single_host_server.html
+++ b/doc/single_host_server.html
@@ -56,7 +56,7 @@ Each project directory contains:
 Create two directories, used to store symbolic links
 to project-specific HTML and CGI directories.
 You might call these boinc_html and boinc_cgi.
-Then edit your Apache configuration file,
+Then edit your Apache configuration file <i>httpd.conf</i>,
 adding something like the following:
 
 <pre>
@@ -77,7 +77,19 @@ ScriptAlias /david_cgi/ "/users/david/boinc_cgi/"
 &lt;/Directory>
 
 </pre>
-
+<p>
+Make sure the following is included
+(failure to do so will create a major security loophole,
+namely your .htconfig.xml files will be readable via HTTP):
+<pre>
+&lt;Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+&lt;/Files>
+</pre>
+(This is included in the standard Apache config file).
+<p>
 You should also set the default MIME type as follows:
 <pre>
 DefaultType application/octet-stream
diff --git a/todo b/todo
index 7a949e00e5..efa8f6739e 100755
--- a/todo
+++ b/todo
@@ -6,6 +6,21 @@ BUGS (arranged from high to low priority)
 - global battery/user active prefs are always true in the client
 - Client should display "Upload failed" and "Download failed" when failure occurs
 - Result status should say "downloading files", "uploading files", etc.
+- message window should reposition to bottom when new message
+- show_message should expect \n, discard it if GUI
+- show "---" for CPU time, %done of results not started yet
+- Win GUI: line between menus and tabs
+- message for client starting or exiting
+- "show graphics" should not use right-click
+- win GUI: reduce flicker?
+- on major version change,
+    should discard any pending WUs
+- labels on disk graph are not clear
+- document and add to global prefs?
+    start_saver
+    run_minimized
+    run_on_startup
+    hangup_if_dialed
 
 -----------------------
 HIGH-PRIORITY (should do for beta test)