Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -592,11 +592,11 @@
 	 (dbfiles        (if old2new (glob (conc *toppath* "/.megatest/*.db")) (glob (conc tmp-area "/.megatest/*.db"))))
 	 (keys (db:get-keys dbstruct))
 	 (sync-durations (make-hash-table)))
 
     ;; kill servers
-    (if (and killservers servers)(db:kill-servers))
+    (if killservers (db:kill-servers))
     
     (if (not dbfiles)
 	(debug:print-error 0 *default-log-port* "no dbfiles found in " (conc *toppath* "/.megatest"))
 	(for-each
 	 (lambda (srcfile)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -962,20 +962,26 @@
         (args:get-arg "-kill-servers"))
     (let ((tl (launch:setup)))
       (if tl ;; all roads from here exit
 	  (let* ((servers (server:choose-server *toppath* 'all-valid)) ;; (server:get-list *toppath*))
 		 (fmtstr  "~33a~22a~20a~20a~8a\n"))
-	    (format #t fmtstr "ID" "host:port" "age (hms)" "Last mod" "State")
-	    (format #t fmtstr "==" "=========" "=========" "========" "=====")
-	    (for-each ;;  ( mod-time host port start-time pid )
+            (if (not servers)
+              (begin
+                (debug:print-info 1 *default-log-port* "No servers found")
+                (exit)
+              )
+            )
+       	    (format #t fmtstr "PID" "host:port" "age (hms)" "Last mod" "State")
+	    (format #t fmtstr "===" "=========" "=========" "========" "=====")
+	    (for-each ;;  (ip-addr port? mod-time host port start-time pid )
 	     (lambda (server)
-	       (let* ((mtm (any->number (car server)))
+	       (let* ((mtm (any->number (caddr server)))
 		      (mod (if mtm (- (current-seconds) mtm) "unk"))
-		      (age (- (current-seconds)(or (any->number (list-ref server 3)) (current-seconds))))
-		      (url (conc (cadr server) ":" (caddr server)))
+		      (age (- (current-seconds)(or (any->number mtm) (current-seconds))))
 		      (pid (list-ref server 4))
-		      (alv (if (number? mod)(< mod 10) #f)))
+		      (url (conc (car server) ":" (cadr server)))
+		      (alv (if (number? mod)(< mod 360) #f)))
 		 (format #t
 			 fmtstr
 			 pid
 			 url
 			 (seconds->hr-min-sec age)
@@ -988,11 +994,10 @@
 		       (server:kill server)))))
 	     (sort servers (lambda (a b)
 			     (let ((ma (or (any->number (car a)) 9e9))
 				   (mb (or (any->number (car b)) 9e9)))
 			       (> ma mb)))))
-	    ;; (debug:print-info 1 *default-log-port* "Done with listservers")
 	    (set! *didsomething* #t)
 	    (exit))
 	  (exit))))
       ;; must do, would have to add checks to many/all calls below
 
@@ -2330,14 +2335,16 @@
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (if (not (server:choose-server *toppath* 'home?))
-	  (begin
-	    (debug:print 0 *default-log-port* "Servers are not running on this host or no servers alive. Cannot run cleanup-db")
-	    (exit 1)))
+
+;;      (if (not (server:choose-server *toppath* 'home?))
+;;	  (begin
+;;	    (debug:print 0 *default-log-port* "Servers are not running on this host or no servers alive. Cannot run cleanup-db")
+;;	    (exit 1)))
+
       (let ((dbstructs (db:setup #f)))
         (common:cleanup-db dbstructs))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")