Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -726,11 +726,11 @@
   (let ((res 0))
     (sqlite3:for-each-row
      (lambda (count)
        (set! res count))
      db
-     "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART','NOT_STARTED');")
+     "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART');") ;; remove NOT_STARTED
     res))
 
 (define (db:get-count-tests-running-in-jobgroup db jobgroup)
   (if (not jobgroup)
       0 ;; 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -8,11 +8,11 @@
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos) ;; (srfi 18) extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format apropos) ;; (srfi 18) extras)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (uses common))
 (declare (uses megatest-version))
@@ -27,10 +27,12 @@
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")
+
+(define (toplevel-command . param) #f)
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2012
@@ -224,10 +226,14 @@
 
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
+
+(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
+  (if (file-exists? debugcontrolf)
+      (load debugcontrolf)))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
 
@@ -350,11 +356,12 @@
 	  (let* ((host:port (db:get-var db "SERVER")) ;; this doen't support multiple servers BUG!!!!
 		 (th2 (server:start db (args:get-arg "-server")))
 		 (th3 (make-thread (lambda ()
 				     (server:keep-running db host:port)))))
 	    (thread-start! th3)
-	    (thread-join! th3))
+	    (thread-join! th3)
+            (set! *didsomething* #t))
 	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;======================================================================
 ;; full run
 ;;======================================================================
@@ -788,16 +795,16 @@
       (if db
 	  (begin
 	    (set! *db* db)
 	    (if (not (args:get-arg "-server"))
 		(server:client-setup))
-	    (import readline)
-	    (import apropos)
-	    (gnu-history-install-file-manager
-	     (string-append
-	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
-	    (current-input-port (make-gnu-readline-port "megatest> "))
+	    ;; (import readline)
+	    ;; (import apropos)
+	    ;; (gnu-history-install-file-manager
+	    ;;  (string-append
+	    ;;   (or (get-environment-variable "HOME") ".") "/.megatest_history"))
+	    ;; (current-input-port (make-gnu-readline-port "megatest> "))
 	    (repl)))
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up