Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -51,21 +51,21 @@
   (if (debug:debug-mode n)
       (with-output-to-port (current-error-port)
 	(lambda ()
 	  (if *logging*
 	      (db:log-event (apply conc params))
-	      (apply print params)
+	      (apply print "pid:" (current-process-id) " " params)
 	      )))))
 
 (define (debug:print-info n . params)
   (if (debug:debug-mode n)
       (with-output-to-port (current-error-port)
 	(lambda ()
 	  (let ((res (format#format #f "INFO: (~2d) ~a" n (apply conc params))))
 	    (if *logging*
 		(db:log-event res)
-		(apply print "INFO: (" n ") " params) ;; res)
+		(apply print "pid:" (current-process-id) " " "INFO: (" n ") " params) ;; res)
 		))))))
 
 ;; if a value is printable (i.e. string or number) return the value
 ;; else return an empty string
 (define-inline (printable val)

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -123,11 +123,11 @@
   (let ((res 0))
     (sqlite3:for-each-row
      (lambda (num-in-queue)
        (set! res num-in-queue))
      mdb
-     "SELECT count(id) FROM servers WHERE run_id=?;"
+     "SELECT count(id) FROM servers WHERE run_id=? AND state = 'available';"
      run-id)
     res))
 
 (define (tasks:server-clean-out-old-records-for-run-id mdb run-id)
   (sqlite3:execute mdb "DELETE FROM servers WHERE state in ('available','shutting-down') AND (strftime('%s','now') - start_time) > 30 AND run_id=?;" run-id))
@@ -202,11 +202,11 @@
 	  (res    '()))
     (sqlite3:for-each-row
      (lambda (a . b)
        (set! res (cons (apply vector a b) res)))
      mdb
-     (conc "SELECT " selstr " FROM servers WHERE run_id=? ORDER BY start_time DESC;")
+     (conc "SELECT " selstr " FROM servers WHERE run_id=? AND state in ('available','running') ORDER BY start_time DESC;")
      run-id)
     (vector header res)))
 
 (define (tasks:get-server mdb run-id)
   (let ((res  #f)

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -64,15 +64,15 @@
 
 # NOTE: Only one instance can be a server
 test5 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
 	cd fullrun;sleep 0;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log &
-	cd fullrun;sleep 5;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log &
-	cd fullrun;sleep 10;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
-#	cd fullrun;sleep 15;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &	
-#	cd fullrun;sleep 0;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
-#	cd fullrun;sleep 0;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &	a
+	cd fullrun;sleep 4;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log &
+	cd fullrun;sleep 8;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
+	cd fullrun;sleep 12;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &	
+	cd fullrun;sleep 16;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
+	cd fullrun;sleep 20;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &
 
 # MUST ADD THIS BACK IN ASAP!!!!
 	# cd fullrun;sleep 10;$(MEGATEST) -run-wait  -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE
 
 test6: fullprep

Index: tests/fdktestqa/testqa/Makefile
==================================================================
--- tests/fdktestqa/testqa/Makefile
+++ tests/fdktestqa/testqa/Makefile
@@ -10,14 +10,14 @@
 	for tn in a b c d;do \
 	   ($(MEGATEST) -runtests % -target a/b :runname $tn & ) ; \
 	done
 
 bigrun :
-	$(MEGATEST) -runtests bigrun -target a/bigrun :runname a
+	$(MEGATEST) -runtests bigrun -target a/bigrun :runname a$(shell date +%V)
 
 bigrun2 :
-	$(MEGATEST) -runtests bigrun2 -target a/bigrun2 :runname a 
+	$(MEGATEST) -runtests bigrun2 -target a/bigrun2 :runname a$(shell date +%V)
 
 dashboard : 
 	$(DASHBOARD) -rows 20 &
 
 compile :