Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -12,14 +12,14 @@
 ;; C L I E N T S
 ;;======================================================================
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 ;; (use zmq)
 
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:))
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb directory-utils)
 
 (declare (unit client))
 
@@ -50,13 +50,13 @@
     ((zmq)  (zmq:client-connect  iface port))
     (else   (rpc:client-connect  iface port))))
 
 (define (client:setup  run-id #!key (remaining-tries 10) (failed-connects 0))
   (case (server:get-transport)
-    ((rpc) (rpc-transport:client-setup run-id)) ;;(client:setup-rpc run-id))
-    ((http)(client:setup-http run-id))
-    (else  (rpc-transport:client-setup run-id)))) ;; (client:setup-rpc run-id))))
+    ((rpc) (rpc-transport:client-setup run-id remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
+    ((http)(client:setup-http run-id remaining-tries: remaining-tries failed-connects: failed-connects))
+    (else  (rpc-transport:client-setup run-id remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
 
 ;; (define (client:login-no-auto-setup server-info run-id)
 ;;   (case (server:get-transport)
 ;;     ((rpc)  (rpc:login-no-auto-client-setup server-info run-id))
 ;;     ((http) (rmt:login-no-auto-client-setup server-info run-id))

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -42,10 +42,17 @@
 
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
 
 ;; GLOBAL GLETCHES
+
+;; Common data structure for 
+(defstruct cxt
+  (taskdb #f))
+
+(define *contexts* (make-hash-table)) ;; toppath => cxt
+
 (define *db-keys* #f)
 
 (define *configinfo*   #f)   ;; raw results from setup, includes toppath and table from megatest.config
 (define *runconfigdat* #f)   ;; run configs data
 (define *configdat*    #f)   ;; megatest.config data
@@ -114,10 +121,14 @@
 
 ;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
 ;; five seconds ago
 (define *pre-reqs-met-cache* (make-hash-table))
 
+;; cache of verbosity given string
+;;
+(define *verbosity-cache* (make-hash-table))
+
 (define (common:clear-caches)
   (set! *target*             (make-hash-table))
   (set! *keys*               (make-hash-table))
   (set! *keyvals*            (make-hash-table))
   (set! *toptest-paths*      (make-hash-table))
@@ -130,10 +141,12 @@
 
 ;; Generic string database
 (define sdb:qry #f) ;; (make-sdb:qry)) ;;  'init #f)
 ;; Generic path database
 (define *fdb* #f)
+
+(define *last-launch* (current-seconds)) ;; use for throttling the launch rate. Would be better to use the db and last time of a test in LAUNCHED state.
 
 ;;======================================================================
 ;; V E R S I O N
 ;;======================================================================
 
@@ -374,10 +387,11 @@
 ;; E X I T   H A N D L I N G
 ;;======================================================================
 
 (define (common:legacy-sync-recommended)
   (or (args:get-arg "-runtests")
+      (args:get-arg "-run")
       (args:get-arg "-server")
       ;; (args:get-arg "-set-run-status")
       (args:get-arg "-remove-runs")
       ;; (args:get-arg "-get-run-status")
       (args:get-arg "-use-db-cache") ;; feels like a bad idea ...

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -44,23 +44,30 @@
 	 (print ((condition-property-accessor 'exn 'message) exn))
 	 (print "Callback error in " procname)
 	 (print "Full condition info:\n" (condition->list exn)))))
    (proc)))
 
+;; this was cached based on results from profiling but it turned out the profiling
+;; somehow went wrong - perhaps too many processes writing to it. Leaving the caching
+;; in for now but can probably take it out later.
+;;
 (define (debug:calc-verbosity vstr)
-  (cond
-   ((number? vstr) vstr)
-   ((not (string?  vstr))   1)
-   ;; ((string-match  "^\\s*$" vstr) 1)
-   (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
-		     (cond
-		      ((> (length debugvals) 1) debugvals)
-		      ((> (length debugvals) 0)(car debugvals))
-		      (else 1))))
-   ((args:get-arg "-v")   2)
-   ((args:get-arg "-q")    0)
-   (else                   1)))
+  (or (hash-table-ref/default *verbosity-cache* vstr #f)
+      (let ((res (cond
+                  ((number? vstr) vstr)
+                  ((not (string?  vstr))   1)
+                  ;; ((string-match  "^\\s*$" vstr) 1)
+                  (vstr           (let ((debugvals  (filter number? (map string->number (string-split vstr ",")))))
+                                    (cond
+                                     ((> (length debugvals) 1) debugvals)
+                                     ((> (length debugvals) 0)(car debugvals))
+                                     (else 1))))
+                  ((args:get-arg "-v")   2)
+                  ((args:get-arg "-q")    0)
+                  (else                   1))))
+        (hash-table-set! *verbosity-cache* vstr res)
+        res)))
 
 ;; check verbosity, #t is ok
 (define (debug:check-verbosity verbosity vstr)
   (if (not (or (number? verbosity)
 	       (list?   verbosity)))

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -628,15 +628,13 @@
 						      " -run -preclean -testpatt " (conc testname "/" (if (equal? item-path "")
 											   "%" 
 											   item-path))
 						      " -clean-cache"
 						      )))
-				       (common:without-vars
-					(conc (dtests:get-pre-command)
-					      cmd 
-					      (dtests:get-post-command))
-					"MT_.*"))))
+                                       (thread-start! (make-thread (lambda ()
+                                                                     (common:run-a-command cmd))
+                                                                   "clean-run-execute")))))
 	       (remove-test (lambda (x)
 			      (iup:attribute-set!
 			       command-text-box "VALUE"
 			       (conc "megatest -remove-runs -target " keystring " -runname " runname
 				     " -testpatt " (conc testname "/" (if (equal? item-path "")

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -1186,10 +1186,11 @@
 ;;
 (define (dashboard:update-tree-selector tabdat #!key (action-proc #f))
   (let* ((tb            (dboard:tabdat-runs-tree tabdat))
 	 (runconf-targs (common:get-runconfig-targets))
 	 (db-target-dat (rmt:get-targets))
+         (runs-tree-ht  (dboard:tabdat-runs-tree-ht tabdat))
 	 (header        (vector-ref db-target-dat 0))
 	 (db-targets    (vector-ref db-target-dat 1))
 	 (munge-target  (lambda (x)            ;; create a target vector from a string. Pad with na if needed.
 			  (take (append (string-split x "/")
 					(make-list (length header) "na"))
@@ -1201,11 +1202,16 @@
 				(map munge-target
 				     runconf-targs)
 				)))
     (for-each
      (lambda (target)
-       (tree:add-node tb "Runs" target)) ;; (append key-vals (list run-name))
+       (if (not (hash-table-ref/default runs-tree-ht target #f))
+           ;; (let ((existing (tree:find-node tb target)))
+           ;;   (if (not existing)
+           (begin
+             (tree:add-node tb "Runs" target) ;; (append key-vals (list run-name))
+             (hash-table-set! runs-tree-ht target #t))))
      all-targets)))
 
 ;; Run controls panel
 ;;
 (define (dashboard:run-controls commondat tabdat #!key (tab-num #f))
@@ -1529,24 +1535,25 @@
 		(let* ((run-record (hash-table-ref/default runs-hash run-id #f))
 		       (key-vals   (map (lambda (key)(db:get-value-by-header run-record runs-header key))
 					(dboard:tabdat-keys tabdat)))
 		       (run-name   (db:get-value-by-header run-record runs-header "runname"))
 		       (col-name   (conc (string-intersperse key-vals "\n") "\n" run-name))
-		       (run-path   (append key-vals (list run-name)))
-		       (existing   (tree:find-node tb run-path)))
+		       (run-path   (append key-vals (list run-name))))
 		  (if (not (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) run-path #f))
-		      (begin
-			(hash-table-set! (dboard:tabdat-run-keys tabdat) run-id run-path)
-			;; (iup:attribute-set! (dboard:tabdat-runs-matrix tabdat)
-			;;    		 (conc rownum ":" colnum) col-name)
-			;; (hash-table-set! runid-to-col run-id (list colnum run-record))
-			;; Here we update the tests treebox and tree keys
-			(tree:add-node tb "Runs" run-path ;; (append key-vals (list run-name))
-				       userdata: (conc "run-id: " run-id))
-			(hash-table-set! (dboard:tabdat-path-run-ids tabdat) run-path run-id)
-			;; (set! colnum (+ colnum 1))
-			))))
+                      ;; (let ((existing   (tree:find-node tb run-path)))
+                      ;;   (if (not existing)
+                      (begin
+                        (hash-table-set! (dboard:tabdat-run-keys tabdat) run-id run-path)
+                        ;; (iup:attribute-set! (dboard:tabdat-runs-matrix tabdat)
+                        ;;    		 (conc rownum ":" colnum) col-name)
+                        ;; (hash-table-set! runid-to-col run-id (list colnum run-record))
+                        ;; Here we update the tests treebox and tree keys
+                        (tree:add-node tb "Runs" run-path) ;; (append key-vals (list run-name))
+                        ;;                                             userdata: (conc "run-id: " run-id))))
+                        (hash-table-set! (dboard:tabdat-path-run-ids tabdat) run-path run-id)
+                        ;; (set! colnum (+ colnum 1))
+                        ))))
 	      run-ids)))
 
 (define (dashboard:tests-ht->tests-dat tests-ht)
   (reverse
    (sort
@@ -2755,18 +2762,18 @@
 	   (let* ((run-record (hash-table-ref/default runs-hash run-id #f))
 		  (key-vals   (map (lambda (key)(db:get-value-by-header run-record runs-header key))
 				   (dboard:tabdat-keys tabdat)))
 		  (run-name   (db:get-value-by-header run-record runs-header "runname"))
 		  (col-name   (conc (string-intersperse key-vals "\n") "\n" run-name))
-		  (run-path   (append key-vals (list run-name)))
-		  (existing   (tree:find-node tb run-path)))
+		  (run-path   (append key-vals (list run-name))))
+             ;; 		  (existing   (tree:find-node tb run-path)))
 	     (if (not (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) run-path #f))
 		 (begin
 		   (hash-table-set! (dboard:tabdat-run-keys tabdat) run-id run-path)
 		   ;; Here we update the tests treebox and tree keys
-		   (tree:add-node tb "Runs" run-path ;; (append key-vals (list run-name))
-				  userdata: (conc "run-id: " run-id))
+		   (tree:add-node tb "Runs" run-path) ;; (append key-vals (list run-name))
+                   ;;				  userdata: (conc "run-id: " run-id))
 		   (hash-table-set! (dboard:tabdat-path-run-ids tabdat) run-path run-id)
 		   ;; (set! colnum (+ colnum 1))
 		   ))))
 	 run-ids))
     ;; (print "Updating rundat")

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -215,11 +215,16 @@
     (if file-write ;; dir-writable
 	(let (;; (lock    (obtain-dot-lock fname 1 5 10))
 	      (db      (sqlite3:open-database fname)))
 	  (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
 	  (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;")
-	  (if (not file-exists)(initproc db))
+	  (if (not file-exists)
+	      (begin
+		(if (string-match "^/tmp/.*" fname) ;; this is a file in /tmp
+		    (sqlite3:execute db "PRAGMA journal_mode=WAL;")
+		    (print "Creating " fname " in NON-WAL mode."))
+		(initproc db)))
 	  ;; (release-dot-lock fname)
 	  db)
 	(begin
 	  (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
 	  (sqlite3:open-database fname))))) ;; )
@@ -315,15 +320,25 @@
 		(db:multi-db-sync #f 'old2new))  ;; migrate data from megatest.db automatically
 	    dbdat)))))
 
 ;; Make the dbstruct, setup up auxillary db's and call for main db at least once
 ;;
+;; called in http-transport and replicated in rmt.scm for *local* access. 
+;;
 (define (db:setup run-id #!key (local #f))
   (let* ((dbdir    (db:dbfile-path #f)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
 	 (dbstruct (make-dbr:dbstruct path: dbdir local: local)))
     dbstruct))
 
+;; open the local db for direct access (no server)
+;;
+(define (db:open-local-db-handle)
+  (or *dbstruct-db*
+      (let ((dbstruct (db:setup #f local: #t)))
+	(set! *dbstruct-db* dbstruct)
+	dbstruct)))
+	  
 ;; Open the classic megatest.db file in toppath
 ;;
 (define (db:open-megatest-db #!key (path #f))
   (let* ((dbpath       (or path (conc *toppath* "/megatest.db")))
 	 (dbexists     (file-exists? dbpath))
@@ -1463,10 +1478,15 @@
     (if (and (null? incompleted)
 	     (null? oldlaunched)
 	     (null? toplevels))
 	#f
 	#t)))
+
+;; given a launch delay (minimum time from last launch) return amount of time to wait
+;;
+;; (define (db:launch-delay-left dbstruct run-id launch-delay)
+  
 
 ;;  select end_time-now from
 ;;      (select testname,item_path,event_time+run_duration as
 ;;                          end_time,strftime('%s','now') as now from tests where state in
 ;;      ('RUNNING','REMOTEHOSTSTART','LAUNCED'));

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -711,11 +711,16 @@
 	 (sections (if target (list "default" target) #f)) ;; for runconfigs
 	 (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
 	 (rundir   (if (and runname target linktree)(conc linktree "/" target "/" runname) #f))
 	 (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	 (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	 (cancreate (and rundir (file-exists? rundir)(file-write-access? rundir))))
+	 (cancreate (and rundir (file-exists? rundir)(file-write-access? rundir)))
+         (cxt       (hash-table-ref/default *contexts* toppath #f)))
+
+    ;; create our cxt for this area if it doesn't already exist
+    (if (not cxt)(hash-table-set! *contexts* toppath (make-cxt)))
+
     ;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
     (set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
     (cond
      ;; data was read and cached and available in *configstatus*, toppath has already been set
      ((eq? *configstatus* 'fulldata)
@@ -1035,10 +1040,18 @@
 ;; 4. remotely run the test on allocated host
 ;;    - could be ssh to host from hosts table (update regularly with load)
 ;;    - could be netbatch
 ;;      (launch-test db (cadr status) test-conf))
 (define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
+  (let loop ((delta        (- (current-seconds) *last-launch*))
+	     (launch-delay (string->number (or (configf:lookup *configdat* "setup" "launch-delay") "5"))))
+    (if (> launch-delay delta)
+	(begin
+	  (debug:print-info 0 *default-log-port* "Delaying launch of " test-name " for " (- launch-delay delta) " seconds")
+	  (thread-sleep! (- launch-delay delta))
+	  (loop (- (current-seconds) *last-launch*) launch-delay))))
+  (set! *last-launch* (current-seconds))
   (change-directory *toppath*)
   (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute"
    (list ;; (list "MT_TEST_RUN_DIR" work-area)
     (list "MT_RUN_AREA_HOME" *toppath*)
     (list "MT_TEST_NAME" test-name)

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6205)
+(define megatest-version 1.6208)
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -11,11 +11,11 @@
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc ;; (srfi 18) extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
      http-client srfi-18 extras format) ;;  zmq extras)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -225,18 +225,13 @@
 				 (cons newmax-cmd currmax)
 				 (cons 'none 0))
 			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
     (mutex-unlock! *db-stats-mutex*)
     res))
-	  
+
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
-  (let* ((dbstruct-local (if *dbstruct-db*
-			     *dbstruct-db*
-			     (let* ((dbdir (db:dbfile-path #f)) ;;  (conc    (configf:lookup *configdat* "setup" "linktree") "/.db"))
-				    (db (make-dbr:dbstruct path:  dbdir local: #t)))
-			       (set! *dbstruct-db* db)
-			       db)))
+  (let* ((dbstruct-local (db:open-local-db-handle))
 	 (db-file-path   (db:dbfile-path 0))
 	 ;; (read-only      (not (file-read-access? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (api:execute-requests dbstruct-local (vector (symbol->string cmd) params)))
 	 (success        (vector-ref resdat 0))
@@ -347,14 +342,23 @@
 ;;
 (define (rmt:get-key-val-pairs run-id)
   (rmt:send-receive 'get-key-val-pairs run-id (list run-id)))
 
 (define (rmt:get-keys)
-  (rmt:send-receive 'get-keys #f '()))
+  (if *db-keys* *db-keys* 
+     (let ((res (rmt:send-receive 'get-keys #f '())))
+       (set! *db-keys* res)
+       res)))
 
+;; we don't reuse run-id's (except possibly *after* a db cleanup) so it is safe
+;; to cache the resuls in a hash
+;;
 (define (rmt:get-key-vals run-id)
-  (rmt:send-receive 'get-key-vals #f (list run-id)))
+  (or (hash-table-ref/default *keyvals* run-id #f)
+      (let ((res (rmt:send-receive 'get-key-vals #f (list run-id))))
+        (hash-table-set! *keyvals* run-id res)
+        res)))
 
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1324,11 +1324,11 @@
     ;; now *if* -run-wait we wait for all tests to be done
     ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
     (thread-sleep! 5) ;; I think there is a race condition here. Let states/statuses settle
     (let wait-loop ((num-running      (rmt:get-count-tests-running-for-run-id run-id))
 		    (prev-num-running 0))
-      (BB> "num-running=" num-running ", prev-num-running=" prev-num-running)
+      ;; (BB> "num-running=" num-running ", prev-num-running=" prev-num-running)
       (if (and (or (args:get-arg "-run-wait")
 		   (equal? (configf:lookup *configdat* "setup" "run-wait") "yes"))
 	       (> num-running 0))
 	  (begin
 	    ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -48,34 +48,34 @@
 	cd simplerun ; $(MEGATEST) -server - -debug $(DEBUG)
 
 test1 : cleanprep
 
 test2 : fullprep
-	cd fullrun;$(MEGATEST) -preclean -runtests ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none :runname $(RUNNAME) -debug $(DEBUG) $(LOGGING)
-	cd fullrun;megatest -preclean -runtests % -target ubuntu/nfs/none :runname $(RUNNAME)_01 -testpatt %/,%/ai -debug $(DEBUG)
-	cd fullrun;megatest -preclean -runtests %/,%/ai -target ubuntu/nfs/none :runname $(RUNAME)_02 -debug $(DEBUG)
-	cd fullrun;megatest -preclean -runtests runfirst/%,%/ai -target ubuntu/nfs/none :runname $(RUNNAME)_02 -debug $(DEBUG)
-	cd fullrun;megatest -runtests %/,%/winter -target ubuntu/nfs/none :runname $(RUNNAME)_03  -debug $(DEBUG)
-	sleep 40;cd fullrun;megatest -target ubuntu/nfs/none :runname $(RUNNAME) -set-state-status COMPLETED,FORCED :state COMPLETED :status PASS -testpatt ez_p%s,runfirst/ -debug $(DEBUG) $(LOGGING)
+	cd fullrun;$(MEGATEST) -preclean -runtests ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none -runname $(RUNNAME) -debug $(DEBUG) $(LOGGING)
+	cd fullrun;megatest -preclean -runtests % -target ubuntu/nfs/none -runname $(RUNNAME)_01 -testpatt %/,%/ai -debug $(DEBUG)
+	cd fullrun;megatest -preclean -runtests %/,%/ai -target ubuntu/nfs/none -runname $(RUNAME)_02 -debug $(DEBUG)
+	cd fullrun;megatest -preclean -runtests runfirst/%,%/ai -target ubuntu/nfs/none -runname $(RUNNAME)_02 -debug $(DEBUG)
+	cd fullrun;megatest -runtests %/,%/winter -target ubuntu/nfs/none -runname $(RUNNAME)_03  -debug $(DEBUG)
+	sleep 40;cd fullrun;megatest -target ubuntu/nfs/none -runname $(RUNNAME) -set-state-status COMPLETED,FORCED :state COMPLETED :status PASS -testpatt ez_p%s,runfirst/ -debug $(DEBUG) $(LOGGING)
 
 
 test3 : fullprep test3a test3b
 
 test3a :
 	@echo Run runfirst and any waitons.
-	cd fullrun;$(MEGATEST) -preclean -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b 
+	cd fullrun;$(MEGATEST) -preclean -runtests runfirst -reqtarg ubuntu/nfs/none -runname $(RUNNAME)_b 
 
 test3b :
 	@echo Run all_toplevel and all waitons
-	cd fullrun;$(MEGATEST) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_c
+	cd fullrun;$(MEGATEST) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none -runname $(RUNNAME)_c
 
 test4 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
-	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -run-wait -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
+	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -run-wait -run -testpatt % -reqtarg ubuntu/nfs/none -runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 
 test4a : cleanprep
-	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
+	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -run -testpatt all_toplevel -reqtarg ubuntu/nfs/none -runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 
 # NOTE: Only one instance can be a server
 test5 : cleanprep
 	rm -f fullrun/a*.log fullrun/logs/*
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -32,11 +32,13 @@
 # and set the dbdir to /var/tmp/$USER/mt_db to enable keeping
 # the raw db in /var/tmp/$USER
 #
 faststart  no
 monitordir #{getenv MT_RUN_AREA_HOME}/db
-dbdir      #{getenv MT_RUN_AREA_HOME}/db
+dbdirdefn  /tmp/#{getenv USER}/#{getenv MT_TESTSUITE_NAME}/db
+dbdirmkdir #{scheme (create-directory "#{get setup dbdirdefn}" #t)}
+dbdir      #{get setup dbdirdefn}
 
 # sync more aggressively to megatest-db
 megatest-db yes
 
 # Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding

Index: utils/viewscreen
==================================================================
--- utils/viewscreen
+++ utils/viewscreen
@@ -14,6 +14,6 @@
     screen -X hardstatus alwayslastline
     screen -X hardstatus string '%{= kG}[ %{G}%H %{g}][%= %{= kw}%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}][%{B} %m-%d %{W} %c %{g}]'
 fi
 
 cmd="cd $PWD;$*"
-screen -X screen bash -c "$cmd;echo \"Press any key to continue, ctrl-f <space> to see other windows\";bash -c 'read -n 1 -s'"
+screen -X screen bash -c "$cmd;echo \"Press any key to continue, ctrl-f <space> to see other windows\";bash -c 'read -n 1 -s'" &