@@ -161,11 +161,11 @@
 	  
 	  )
 	
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
-
+(define *didsomething* #f)  
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 ;; (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
@@ -319,11 +319,11 @@
      (if (not (directory-exists? log-dir))
 	 (system (conc "mkdir -p " log-dir)))
      (open-output-file logpath))
    (exn ()
 	(debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath-in)
-	(define *didsomething* #t)  
+	(set! *didsomething* #t)
 	(exit 1))))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
@@ -503,18 +503,10 @@
 Version " megatest-version ", built from " megatest-fossil-hash ))
      
 (define (main)
   (make-and-init-bigdata)
 
-  
-  ;; set up the functions in http transport
-;;   (hash-table-set! *http-functions* 'api:process-request          api:process-request)
-;;   (hash-table-set! *http-functions* 'http-transport:main-page     http-transport:main-page)
-;;   (hash-table-set! *http-functions* 'http-transport:show-jquery   http-transport:show-jquery)
-;;   (hash-table-set! *http-functions* 'http-transport:html-test-log http-transport:html-test-log)
-;;   (hash-table-set! *http-functions* 'http-transport:html-dboard   http-transport:html-dboard)
-  
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
 ;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
@@ -828,12 +820,10 @@
      (if (args:get-arg "-version")
          (begin
            (print (common:version-signature)) ;; (print megatest-version)
            (exit)))
      
-     (define *didsomething* #f)
-     
      ;; Overall exit handling setup immediately
      ;;
      (if (or (args:get-arg "-process-reap"))
              ;; (args:get-arg "-runtests")
      	;; (args:get-arg "-execute")
@@ -2640,11 +2630,11 @@
      ;;(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
-     (let* ((watchdog (bdat-watchdog *bdat*)))
+     #;(let* ((watchdog (bdat-watchdog *bdat*)))
        (if (thread? watchdog)
 	   (case (thread-state watchdog)
 	     ((ready running blocked sleeping terminated dead)
 	      (thread-join! watchdog)))))