diff --git a/client/cs_apps.C b/client/cs_apps.C
index 5221a79e3d..b95be2cc45 100644
--- a/client/cs_apps.C
+++ b/client/cs_apps.C
@@ -30,6 +30,7 @@
 //
 int CLIENT_STATE::make_slot_dirs() {
     unsigned int i;
+    printf("num slots is: %d\n",nslots);
     for (i=0; i<nslots; i++) {
         make_slot_dir(i);
     }
@@ -191,7 +192,6 @@ bool CLIENT_STATE::start_apps() {
 	    if(retval) {
 		atp->state = PROCESS_COULDNT_START;
 		atp->result->active_task_state = PROCESS_COULDNT_START;
-	
 		report_project_error(*(atp->result),retval,"Couldn't start the app for this result.\n",CLIENT_COMPUTING);
 	    }
             action = true;
diff --git a/doc/protocol.html b/doc/protocol.html
index ab08d8d5a9..01924126dd 100644
--- a/doc/protocol.html
+++ b/doc/protocol.html
@@ -97,12 +97,41 @@ Request elements include
 &lt;/host_info&gt;
 &lt;result&gt;
     &lt;name&gt;uc_wu_0&lt;/name&gt;
-    &lt;exit_status&gt;0&lt;/exit_status&gt;
-    &lt;cpu_time&gt;0.020000&lt;/cpu_time&gt;
-    &lt;output_file&gt;
-        &lt;md5_cksum&gt;3f7b90793a0175ad0bda68684e8bd136&lt;/md5_cksum&gt;
+    &lt;client_state&gt;4&lt;/client_state&gt;
+    &lt;final_cpu_time&gt;0.020000&lt;/final_cpu_time&gt;
+    &lt;stderr_out&gt;
+    The following fields are used to report errors to the server, They
+    are not present if there is no error while downloading, computing
+    or uploading files for this result.
+    [ &lt;message&gt; some text describing the error &lt;/message&gt;]   ]
+    The state of the active_task assigned to compute this result at
+    the time of the error
+    [ &lt;active_task_state&gt;0&lt;/active_task_state&gt; ]
+    The exit_status of the application running the computation for the result
+    [ &lt;exit_status&gt;0&lt;/exit_status&gt; ]
+    The signal raised by the application if any.
+    [ &lt;signal&gt;0&lt;/signal&gt; ]
+    If the error corresponds to downloading input files for the
+    work_unit for this result, then:
+    &lt;download_error&gt;
+        &lt;file_name&gt;input&lt;/file_name&gt;
+	&lt;error_code&gt;-114&lt;/error_code&gt;
+    &lt;/download_error&gt;
+    If the error corresponds to uploading outfiles for this results
+    then:
+    &lt;upload_error&gt;
+        &lt;file_name&gt;output&lt;/file_name&gt;
+	&lt;error_code&gt;-114&lt;/error_code&gt;
+    &lt;/upload_error&gt;
+    the std_err output of the application, if any, goes here.
+    &lt;/stderr_out&gt; 
+    &lt;file_info&gt;
         &lt;file_name&gt;uc_wu_0_0&lt;/file_name&gt;
-    &lt;/output_file&gt;
+        &lt;md5_cksum&gt;3f7b90793a0175ad0bda68684e8bd136&lt;/md5_cksum&gt;
+	&lt;nbytes&gt;54691.0000000&lt;/nbytes&gt;
+	&lt;max_nbytes&gt;1000000.00000&lt;/max_nbytes&gt;
+	&lt;url&gt;http://localhost/hamid_cgi/test/file_upload_handler&lt;/url&gt;
+    &lt;/file_info&gt;
 &lt;/result&gt;
 </pre>
 
diff --git a/html/ops/db.inc b/html/ops/db.inc
index 26e7c2217d..57c1cb1a33 100644
--- a/html/ops/db.inc
+++ b/html/ops/db.inc
@@ -177,7 +177,7 @@ function show_result($result,$show_xml_docs,$show_stderr,$show_times) {
     row("state", res_state_string($result->server_state));
     row("Deadline", time_str($result->report_deadline));
     row("Host ID", "<a href=db.php?show=host&id=$result->hostid>" . host_name_by_id($result->hostid) . "</a>");
-    row("Client State", $result->client_state);
+    row("Client_state: ", $result->client_state);
     row("CPU time", $result->cpu_time);
     if ($show_xml_docs) {
         row("XML doc in", "<pre>".htmlspecialchars($result->xml_doc_in)."</pre>");
diff --git a/sched/result_retry.C b/sched/result_retry.C
index 4a3b6dd2cc..d92c8e9bd3 100644
--- a/sched/result_retry.C
+++ b/sched/result_retry.C
@@ -160,9 +160,9 @@ bool do_pass(APP& app) {
     //
     while (!db_workunit_enum_retry_check_time(wu)) {
         vector<RESULT> results;
-
+	
         did_something = true;
-
+	printf("inside while loop of result_retry");
         // if this WU has a canonical result, we're done
         // (this normally doesn't happen since the retry check time
         // is zeroed when canonical result found, but just in case).
@@ -230,7 +230,9 @@ bool do_pass(APP& app) {
         //
         if (nredundancy > ndone) {
             n = nredundancy - ndone;
-            for (i=0; i<n; i++) {
+	    printf("nredundancy is: %d, ndone is %d",nredundancy,ndone);
+            
+	    for (i=0; i<n; i++) {
                 result = results[0];
                 make_unique_name(result.name);
                 initialize_result(result, wu);
diff --git a/test/test.inc b/test/test.inc
index 391fe94680..b1f50374a7 100644
--- a/test/test.inc
+++ b/test/test.inc
@@ -398,6 +398,11 @@ class Project {
         PassThru("cd $this->project_dir/cgi; ./feeder -asynch > feeder_out");
     }
 
+    function start_result_retry($app){
+       PassThru("cd $this->project_dir/cgi; ./result_retry -app $app->name -nerror 10 -ndet 10 -nredundancy 10 -asynch > result_retry_out");
+    }
+      
+
     function start_make_work($work){
         $result_template_path = realpath($work->result_template);
         PassThru("cd $this->project_dir/cgi; ./make_work -asynch -result_template $result_template_path -wu_name $work->wu_template > make_work_out");
diff --git a/test/test_uc.php b/test/test_uc.php
index 442b12170b..10037d4099 100644
--- a/test/test_uc.php
+++ b/test/test_uc.php
@@ -34,7 +34,7 @@
     $work->wu_template = "uc_wu";
     $work->result_template = "uc_result";
     $work->redundancy = 2;
-    $work->delay_bound = 10;
+    $work->delay_bound = 2;
     array_push($work->input_files, "input");
     $work->install($project);