@@ -100,16 +100,15 @@
 		(thread-sleep! 2))
 	      (begin
 		(if (runs:lownoise "runners-softlock-nowait" 360)
 		    (debug:print-info 0 *default-log-port* "No runners in flight, updating softlock"))
 		(let* ((ouf (open-output-file my-lock-file)))
-		  (with-output-to-port ouf
-		    (lambda ()(print (current-seconds))))
+		  (with-output-to-port ouf (lambda ()(print (current-seconds))))
 		  (close-output-port ouf))))
 	  (runs:dat-last-fuel-check-set! rdat (current-seconds))))))
   
-;; Fourth try, do accounting through time
+;; Fourth try, do accounting through time....
 ;;
 (define (runs:parallel-runners-mgmt rdat)
   (let ((time-to-check (configf:lookup-number *configdat* "runners" "time-to-check" default: 10)) ;; 28
 	(time-to-wait  (configf:lookup-number *configdat* "runners" "time-to-wait" default: 30))
 	(now-time      (current-seconds)))
@@ -228,13 +227,12 @@
 		(begin
 		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count
 			       " times. Message: " msg)
 		  (debug:print 0 *default-log-port* "Call chain:")
 		  (with-output-to-port *default-log-port*
-
-                    (lambda ()
-                      (print "*configdat* is >>"*configdat*"<<")
+		    (lambda ()
+		      (print "*configdat* is >>"*configdat*"<<")
                       (pp *configdat*)
                       (pp call-chain)))
                   
 		  (exit 1))))
           ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
@@ -559,15 +557,15 @@
     ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
 		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (set! *time-to-exit* #t)
-		     (print "Received signal " signum ", cleaning up before exit. Please wait...")
+		     (debug:print 0 *default-log-port* "Received signal " signum ", cleaning up before exit. Please wait...")
 		     (let ((th1 (make-thread (lambda ()
 					       ;; (let ((tdbdat (tasks:open-db)))
 						 (rmt:tasks-set-state-given-param-key task-key "killed") ;; )
-					       (print "Killed by signal " signum ". Exiting")
+					       (debug:print 0 *default-log-port* "Killed by signal " signum ". Exiting")
 					       (thread-sleep! 3)
 					       (exit))))
 			   (th2 (make-thread (lambda ()
 					       (thread-sleep! 5)
 					       (debug:print 0 *default-log-port* "Done")
@@ -803,19 +801,19 @@
     (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
 		 (run-queue-retries 5)
-		 #;(th1        (make-thread (lambda ()
-					    (handle-exceptions
-						exn
-						(begin
-						  (print-call-chain)
-						  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
-					      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
-								    (any->number reglen) all-tests-registry)))
-					  "runs:run-tests-queue"))
+		;; (th1        (make-thread (lambda ()
+		;; 			    (handle-exceptions
+		;; 				exn
+		;; 				(begin
+		;; 				  (print-call-chain)
+		;; 				  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
+		;; 			      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+		;; 						    (any->number reglen) all-tests-registry)))
+		;; 			  "runs:run-tests-queue"))
 		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
 					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
 					    (let ((run-ids (rmt:get-all-run-ids)))
 					      (for-each (lambda (run-id)
 							  (if keep-going
@@ -2214,11 +2212,11 @@
 		       (if (runs:dat-wait-for-jobs-function runsdat)
 			   ((runs:dat-wait-for-jobs-function runsdat) testdat-rec))
 		       
 		       (if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
 			   (begin
-			     (print "ERROR: Failed to launch the test. Exiting as soon as possible")
+			     (debug:print 0 *default-log-port* "ERROR: Failed to launch the test. Exiting as soon as possible")
 			     (set! *globalexitstatus* 1) ;; 
 			     (process-signal (current-process-id) signal/kill))
 			   )
 		       ;; wait again here?
 		       ))))))
@@ -2737,13 +2735,13 @@
     ;; special case - archive get
     (if (equal? (args:get-arg "-archive") "get")
 	(archive:bup-get-data "get" #f #f test-records rp-mutex bup-mutex))
     (if (or (equal? (args:get-arg "-archive") "save") (equal? (args:get-arg "-archive") "save-remove"))
         (begin 
-             (print "db archive started")  
+             (debug:print 0 *default-log-port* "db archive started")  
              (archive:megatest-db target runnamepatt)
-             (print "db archived")))
+             (debug:print 0 *default-log-port* "db archived")))
     )
   #t
   )
 
 (define (runs:remove-test-directory test mode) ;; remove-data-only)
@@ -2908,11 +2906,11 @@
 	      (fld (car  key))
 	      (val (configf:lookup test-conf "test_meta" fld)))
 	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
 	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
 	     (begin
-	       (print "Updating " test-name " " fld " to " val)
+	       (debug:print 0 *default-log-port* "Updating " test-name " " fld " to " val)
 	       (rmt:testmeta-update-field test-name fld val)))))
      '(("author" 2)("owner" 3)("description" 4)("reviewed" 5)("tags" 9)("jobgroup" 10)))))
 
 ;; find tests with matching tags, tagpatt is a string "tagpatt1,tagpatt2%, ..."
 ;;