diff --git a/sched/handle_request.C b/sched/handle_request.C
index aeeb0ec444..8a44ab0448 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -537,7 +537,7 @@ int handle_results(
         // check it against the canonical result (if its result hasn't been
         // deleted yet).
 
-        // TODO: Fix documentation state diagrams.        
+        // TODO: Fix documentation state diagrams.
 
         // if (result.server_state == RESULT_SERVER_STATE_OVER) {
         //     result.file_delete_state = FILE_DELETE_READY;
@@ -606,6 +606,7 @@ int handle_results(
         } else {
             result.outcome = RESULT_OUTCOME_CLIENT_ERROR;
             result.validate_state = VALIDATE_STATE_INVALID;
+            // TODO: set timeout check to NOW
         }
 
         strncpy(result.stderr_out, rp->stderr_out, sizeof(result.stderr_out));
diff --git a/sched/timeout_check.C b/sched/timeout_check.C
index fbc8baec90..70c38755dc 100644
--- a/sched/timeout_check.C
+++ b/sched/timeout_check.C
@@ -260,7 +260,7 @@ void handle_wu(DB_WORKUNIT& wu) {
         // to create unique new output filenames.
         //
         if (nredundancy > ndone) {
-            n = nredundancy - ndone;
+            n = nredundancy - ndone; // TODO: subtract # in-progress?
             all_over = false;
 
             log_messages.printf(