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

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -185,10 +185,13 @@
 			"-archive"
 			"-repl"
 			"-lock"
 			"-unlock"
 			"-list-servers"
+			;; mist queries
+			"-list-disks"
+			"-list-targets"
 			;; queries
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests
 			"-remove-runs"
@@ -259,19 +262,33 @@
 
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
+
+;; (if (args:get-arg "-list-targets")
+;;     (print (string-intersperse
+;; 	    (sort (map car (hash-table->alist
+;; 			    (read-config "runconfigs.config"
+;; 					 (make-hash-table) #f))) string<?) "\n")))
+;; 
+;; 
+;; (if (args:get-arg "-list-disks")
+;;     (print (string-intersperse 
+;; 	    (map cadr (hash-table-ref/default 
+;; 		       (read-config "megatest.config" #f #t) 
+;; 		       "disks" "'" 
+;; 		       ("none" ""))) "\n")))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
 
 (if (args:get-arg "-server")
     (begin
-      (debug:print 1 "Launching server...")
+      (debug:print 2 "Launching server...")
       (server:launch)))
 
 (if (args:get-arg "-list-servers")
 	;; (args:get-arg "-kill-server"))
     (let ((tl (setup-for-run)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -865,11 +865,12 @@
 	      (exit 1)))
 	(if (args:get-arg "-server")
 	    (open-run-close server:start db (args:get-arg "-server"))
  	    (if (not (or (args:get-arg "-runall")     ;; runall and runtests are allowed to be servers
  			 (args:get-arg "-runtests")))
-		(server:client-setup)))
+		(server:client-setup) ;; This is a duplicate startup!!!??? BUG?
+		))
 	(set! keys (open-run-close db:get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
 	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
 		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -78,11 +78,11 @@
 (define-inline (zmqsock:get-pull dat)(vector-ref dat 1))
 (define-inline (zmqsock:set-pub! dat s)(vector-set! dat s 0))
 (define-inline (zmqsock:set-pull! dat s)(vector-set! dat s 0))
 
 (define (server:run hostn)
-  (debug:print 0 "Attempting to start the server ...")
+  (debug:print 2 "Attempting to start the server ...")
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: cannot find megatest.config, cannot start server, exiting")
 	    (exit))))
@@ -218,11 +218,11 @@
 	   (server:find-free-port-and-open iface s (+ p 1) trynum: (- trynum 1))
 	   (debug:print-info 0 "Tried ports up to " p 
 			     " but all were in use. Please try a different port range by starting the server with parameter \" -port N\" where N is the starting port number to use"))
        (exit)) ;; To exit or not? That is the question.
      (let ((zmq-url (conc "tcp://" iface ":" p)))
-       (debug:print 0 "Trying to start server on " zmq-url)
+       (debug:print 2 "Trying to start server on " zmq-url)
        (bind-socket s zmq-url)
        (list iface s port)))))
 
 (define (server:setup-ports ipaddrstr startport)
   (let* ((s1 (server:find-free-port-and-open ipaddrstr #f startport 'pull))
@@ -333,12 +333,16 @@
 	  ;;    (server:client-setup (- numtries 1))
 	  ;;    #f)
 	   (server:client-connect iface pullport pubport)) ;; )
 	(if (> numtries 0)
 	    (let ((exe (car (argv))))
-	      (debug:print-info 1 "No server available, attempting to start one...")
+	      (debug:print-info 2 "No server available, attempting to start one...")
 	      (process-run exe (list "-server" "-" "-debug" (conc *verbosity*)))
+	      ;; (process-fork (lambda ()
+	      ;;   	      (server:launch)
+	      ;;   	      (exit) ;; should never get here ....
+	      ;;   	      ))
 	      (sleep 5) ;; give server time to start
 	      ;; we are starting a server, do not try again! That can lead to 
 	      ;; recursively starting many processes!!!
 	      (server:client-setup numtries: 0))
 	    (debug:print-info 1 "Too many attempts, giving up")))))
@@ -348,26 +352,26 @@
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: cannot find megatest.config, exiting")
 	    (exit))))
-  (debug:print-info 1 "Starting the standalone server")
+  (debug:print-info 2 "Starting the standalone server")
   (let ((hostinfo (open-run-close tasks:get-best-server tasks:open-db)))
     (if hostinfo
-	(debug:print-info 1 "NOT starting new server, one is already running on " (car hostinfo) ":" (cadr hostinfo))
+	(debug:print-info 2 "NOT starting new server, one is already running on " (car hostinfo) ":" (cadr hostinfo))
 	(if *toppath* 
 	    (let* (;; (th1 (make-thread (lambda ()
 		   ;;      	       (let ((server-info #f))
 		   ;;      		 ;; wait for the server to be online and available
 		   ;;      		 (let loop ()
-		   ;;      		   (debug:print-info 1 "Waiting for the server to come online before starting heartbeat")
+		;;			   (debug:print-info 2 "Waiting for the server to come online before starting heartbeat")
 		   ;;      		   (thread-sleep! 2)
 		   ;;      		   (mutex-lock! *heartbeat-mutex*)
 		   ;;      		   (set! server-info *server-info* )
 		   ;;      		   (mutex-unlock! *heartbeat-mutex*)
 		   ;;      		   (if (not server-info)(loop)))
-		   ;;      		 (debug:print 1 "Server alive, starting self-ping")
+		;;			 (debug:print 2 "Server alive, starting self-ping")
 		   ;;      		 (server:self-ping server-info)
 		   ;;      		 ))
 		   ;;      	     "Self ping"))
 		   (th2 (make-thread (lambda ()
 				       (server:run (args:get-arg "-server"))) "Server run"))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -49,12 +49,12 @@
 test5 : fullprep
 	cd fullrun;sleep  0;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &	
-	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
-	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &	
+	# cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
+	# cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &	
 
 test6: fullprep
 	cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v
 	cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10
 	cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10