diff --git a/api/api_test.C b/api/api_test.C
index bb7bb250a4..6d205971e3 100644
--- a/api/api_test.C
+++ b/api/api_test.C
@@ -33,7 +33,7 @@ int main() {
     mf.printf("foo\n");
     for(; i<100000000; i++) {
 	if(time_to_checkpoint()) {
-	    mf.printf("checkpoint\n");
+	    mf.printf("checkpoint: %d\n", temp);
 	    mf.flush();
             ao.percent_done = 1;
 	    checkpoint_completed(ao);
diff --git a/checkin_notes b/checkin_notes
index 9df0546e8b..6e47ff7c32 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -644,6 +644,26 @@ Michael Gary	6/25/2002
     doc/
         test.html
 
+Michael Gary	6/27/2002
+    - Fixed a bug in add_work and added water level testing to test_uc.php
+
+    test/
+        test_uc.php
+    tools/
+        add_work.C
+
+Michael Gary	6/28/2002
+    - Added an explicit test for water level
+    - Added a -no_time_test argument to the boinc client to stop the time tests
+        from running. 
+
+    client/
+        main.C
+        client_state.h
+        client_state.C
+    test/
+        test_water.php (new)
+
 Eric Heien 7/01/2002
     - Added S@H test scripts, added other testing functionality.
     - Added random WU generation.
@@ -668,3 +688,19 @@ Eric Heien 7/01/2002
     tools/
         create_work.C
 
+Michael Gary	7/01/2002
+    - Fixed fast cgi scheduling server
+    - If low water mark is higher than high water mark, water marks are
+        switched
+    - Updated documentation
+
+    doc/
+        flow.html
+        protocol.html
+    client/
+        client_state.C
+        cs_scheduler.C
+    sched/
+        main.C
+    test/
+        prefs1.xml
diff --git a/client/client_state.C b/client/client_state.C
index 915a42c01c..416978de5f 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -92,6 +92,7 @@ int CLIENT_STATE::time_tests() {
     host_info.p_iops = run_int_test(4);
     host_info.p_membw = run_mem_bandwidth_test(4);
     host_info.p_calculated = (double)time(0); //set time calculated
+    //host_info.m_cache = check_cache_size(CACHE_MAX);
     return 0;
 }
 
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 35d316c89c..d477924f62 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -63,6 +63,12 @@ double CLIENT_STATE::current_water_days() {
 }
 
 bool CLIENT_STATE::need_work() {
+    double temp;
+    if(prefs->high_water_days < prefs->low_water_days) {
+        temp = prefs->high_water_days;
+        prefs->high_water_days = prefs->low_water_days;
+        prefs->low_water_days = temp;
+    }
     return (current_water_days() <= prefs->low_water_days);
 }
 
diff --git a/doc/flow.html b/doc/flow.html
index b0e5f2cc79..69f37d8f01 100644
--- a/doc/flow.html
+++ b/doc/flow.html
@@ -13,7 +13,9 @@ the <b>high-water mark</b> and the <b>low-water mark</b>
 Normally the work remaining is between the high- and low-water marks.
 Then the work remaining reaches the low-water mark,
 the core client contacts one or more scheduling servers,
-and attempts to get enough work to exceed the high-water mark.
+and attempts to get enough work to exceed the high-water mark. The
+scheduling server sends a minimum of one hour of work and a maximum of
+four weeks of work. 
 
 <p>
 The amount of work (measured in FP/int ops) sent
diff --git a/doc/protocol.html b/doc/protocol.html
index 5dd3e193f2..7e21dd1120 100644
--- a/doc/protocol.html
+++ b/doc/protocol.html
@@ -114,8 +114,8 @@ Reply elements include
 &lt;message priority="low">no work available&lt;/message>
 &lt;prefs_mod_time>123123&lt;/prefs_mod_time>
 &lt;preferences>
-    &lt;low_water>1.2&lt;/low_water>
-    &lt;high_water>2.5&lt;/high_water>
+    &lt;low_water_days>1.2&lt;/low_water_days>
+    &lt;high_water_days>2.5&lt;/high_water_days>
     &lt;disk_max_used_gb>0.4&lt;/disk_max_used_gb>
     &lt;disk_max_used_pct>50&lt;/disk_max_used_pct>
     &lt;disk_min_free_gb>0.4&lt;/disk_min_free_gb>
diff --git a/sched/main.C b/sched/main.C
index 155869319d..dc27c2e6ad 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -49,11 +49,11 @@ int main() {
     SCHED_SHMEM* ssp;
     void* p;
     
-    #ifdef _USING_FCGI_
-    int counter = 0;
-    while(FCGI_Accept >= 0) {
-    counter++;
-    #endif
+#ifdef _USING_FCGI_
+
+    while(FCGI_Accept() >= 0) {
+
+#endif
     retval = attach_shmem(BOINC_KEY, &p);
     if (retval) {
         printf("can't attach shmem\n");
@@ -116,8 +116,8 @@ int main() {
 
     unlink(req_path);
     unlink(reply_path);
-    #ifdef _USING_FCGI_
+#ifdef _USING_FCGI_
+
     }
-    printf("loop cycled %d times\n", counter);
-    #endif
+#endif
 }
diff --git a/test/init.inc b/test/init.inc
index c6424f0cd3..3e10dcc430 100644
--- a/test/init.inc
+++ b/test/init.inc
@@ -146,8 +146,8 @@ function create_work($x) {
     PassThru("../tools/create_work $x");
 }
 
-function run_client() {
-    PassThru("../client/".CORE_CLIENT." -exit_when_idle");
+function run_client($args) {
+    PassThru("../client/".CORE_CLIENT." $args");
 }
 
 function start_feeder() {
diff --git a/test/prefs1.xml b/test/prefs1.xml
index a8b23b11e3..18ee04afd1 100644
--- a/test/prefs1.xml
+++ b/test/prefs1.xml
@@ -4,7 +4,7 @@
     <low_water_days>1</low_water_days>
     <resource_share>1</resource_share>
     <project>
-        <master_url>http://maggie.ssl.berkeley.edu/index.html</master_url>
+        <master_url>http://maggie.ssl.berkeley.edu/fcgi.html</master_url>
         <authenticator>3f7b90793a0175ad0bda68684e8bd136</authenticator>
     </project>
 </preferences>
diff --git a/test/test_uc.php b/test/test_uc.php
index 840f7e47d1..29899161d8 100644
--- a/test/test_uc.php
+++ b/test/test_uc.php
@@ -16,7 +16,8 @@
     add_app("upper_case");
     create_work("-appname upper_case -rsc_iops 180000000000.0 -rsc_fpops 0.0 -wu_name uc_wu -wu_template uc_wu -result_template uc_result -nresults 5 input input input input input");
     start_feeder();
-    run_client();
+    //run_client("-exit_after 2");
+    run_client("-exit_when_idle");
     stop_feeder();
 
     check_results_done();
diff --git a/test/tw_correct b/test/tw_correct
deleted file mode 100644
index 00750edc07..0000000000
--- a/test/tw_correct
+++ /dev/null
@@ -1 +0,0 @@
-3