@@ -258,11 +258,11 @@
 	     (case status
 	       ((busy) ;; result will be how long the server wants you to delay
 		(let* ((dly  (if (number? result) result 0.1)))
 		  (debug:print 0 *default-log-port* "WARNING: server for "dbfname" is busy, will try again in "dly" seconds.")
 		  (thread-sleep! dly)
-		  (tt:handler  ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe)))
+		  (tt:handler  ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe server-start-proc)))
 	       ((loaded)
 		(debug:print 0 *default-log-port* "WARNING: server for "dbfname" is loaded, slowing queries.")
 		(tt:backoff-incr (tt-conn-host conn)(tt-conn-port conn))
 		result) ;; (tt:handler  ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
 	       (else
@@ -279,11 +279,11 @@
 		   (if (and servinf (file-exists? servinf))
 		       (begin
 			 (if (< attemptnum 10)
 			     (begin
 			       (thread-sleep! 0.5)
-			       (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
+			       (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe server-start-proc))
 			     (begin
 			       (debug:print 0 *default-log-port* "INFO: no response from server "host":"port" for "dbfname)
 			       (if (and (file-exists? servinf)
 					(> (- (current-seconds)(file-modification-time servinf)) 60))
 				   (begin
@@ -290,30 +290,30 @@
 				     (debug:print 0 *default-log-port* "INFO: "servinf" file seems old and no ping response, removing it.")
 				     (handle-exceptions
 					 exn
 				       #f
 				       (delete-file* servinf))
-				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
+				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe server-start-proc))
 				   (begin
 				     ;; start server - addressed in client-connect-to-server
 				     ;; delay        - addressed in client-connect-to-server
 				     ;; try again
 				     (thread-sleep! 0.25) ;; dunno, I think this needs to be here
-				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))
+				     (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe server-start-proc))
 				   ))))
 		       (begin ;; no server file, delay and try again
 			 (debug:print 2 *default-log-port* "INFO: connection to server "host":"port" broken for "dbfname", no servinf file. Server exited? ")
 			 (thread-sleep! 0.5)
-			 (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe))))
+			 (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe server-start-proc))))
 		 (begin ;; this case is where res is malformed. Probably should abort
 		   (assert #f "FATAL: tt:handler received bad data "res)
 		   ;; (debug:print 0 *default-log-port* "INFO: got corrupt data from server "host":"port", "res", for "dbfname", will try again.")
 		   ;; (tt:handler ttdat cmd run-id params (+ attemptnum 1) readonly-mode dbfname testsuite mtexe)
 		   )))))
 	(begin
 	  (thread-sleep! 1) ;; no conn yet set up, give it a rest and try again
-	  (tt:handler ttdat cmd run-id params attemptnum readonly-mode dbfname testsuite mtexe)))))
+	  (tt:handler ttdat cmd run-id params attemptnum readonly-mode dbfname testsuite mtexe server-start-proc)))))
 
 (define (tt:bid-for-servership run-id)
   #f)
 
 ;; gets server info and appends path to server file
@@ -732,14 +732,17 @@
     ;; filter the files here by looking in processes table (if we are not main.db)
     ;; and or look at the time stamp on the servinfo file, a running server will
     ;; touch the file every minute (again, this will only apply for main.db)
     (for-each (lambda (fname)
 		(let* ((age (- (current-seconds)(file-modification-time fname))))
-		  (if (> age 10) ;; can't trust it if over ten seconds old
+		  (if (> age 20) ;; can't trust it if over twenty seconds old
 		      (begin
 			(debug:print 0 *default-log-port* "WARNING: removing stale servinfo file "fname)
-			(delete-file fname))
+			(handle-exceptions
+			 exn
+			 (debug:print 0 *default-log-port* "WARNING: error attempting to remove stale servinfo file "fname)
+			 (delete-file fname))) ;; 
 		      (set! goodfiles (cons fname goodfiles)))))
 	      sfiles)
     goodfiles))
 
 ;; given a path to a server info file return: host port startseconds server-id pid dbfname logf