@@ -366,10 +366,12 @@
 (let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
   (if targ (setenv "MT_TARGET" targ)))
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
+
+;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (define *watchdog* (make-thread common:watchdog "Watchdog thread"))
 
 (if (not (args:get-arg "-server"))
     (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
 
@@ -1081,11 +1083,10 @@
 		      (hash-table-set! test-field-index hed idx)
 		      (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
 		    (begin
 		      (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
 		      (exit)))))
-
 	  ;; Each run
 	  (for-each 
 	   (lambda (run)
 	     (let ((targetstr (string-intersperse (map (lambda (x)
 							 (db:get-value-by-header run header x))
@@ -1349,11 +1350,15 @@
 					 (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory")
 					 (conc (current-directory) "/" outputfile)))))
 		  (create-directory tempdir #t)
 		  (ods:list->ods tempdir ouf sheets))))
 	  ;; (system (conc "rm -rf " tempdir))
-	  (set! *didsomething* #t))))
+	  (set! *didsomething* #t)
+          (set! *time-to-exit* #t)
+          ) ;; end if true branch (end of a let)
+        ) ;; end if
+    ) ;; end if -list-runs
 
 ;; Don't think I need this. Incorporated into -list-runs instead
 ;;
 ;; (if (and (args:get-arg "-since")
 ;; 	 (launch:setup))
@@ -2017,14 +2022,15 @@
 ;; Exit and clean up
 ;;======================================================================
 
 (if (not *didsomething*)
     (debug:print 0 *default-log-port* help))
-;;(BB> "thread-join! watchdog")
+;;(debug:print-info 13 *default-log-port* "thread-join! watchdog")
 
 ;; join the watchdog thread if it has been thread-start!ed  (it may not have been started in the case of a server that never enters running state)
 ;;   (symbols returned by thread-state: created ready running blocked suspended sleeping terminated dead)
+;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (if (thread? *watchdog*)
     (case (thread-state *watchdog*)
       ((ready running blocked sleeping terminated dead)
        (thread-join! *watchdog*))))