@@ -156,10 +156,11 @@
 			":tol"
 			":units"
 			;; misc
 			"-server"
 			"-killserver"
+			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
 			"-setvars"
 			"-set-state-status"
@@ -304,12 +305,12 @@
 		     (begin
 		       (open-run-close tasks:server-deregister tasks:open-db  hostname port: port)
 		       (if status ;; #t means alive
 			   (begin
 			     (if (equal? hostname (get-host-name))
-				 (process-signal pid signal/term)
-				 (cdb:kill-server zmq-socket))
+				 (process-signal pid signal/term) ;; local machine, send sig term
+				 (cdb:kill-server zmq-socket))    ;; remote machine, try telling server to commit suicide
 			     (debug:print-info 1 "Killed server by host:port at " hostname ":" port))
 			   (debug:print-info 1 "Removing defunct server record for " hostname ":" port))
 		       (set! killed #t)))
 		 (if (and kpid
 			  ;; (equal? hostname (car khost-port))
@@ -317,11 +318,11 @@
 		     (begin
 		       (open-run-close tasks:server-deregister tasks:open-db hostname pid: pid)
 		       (set! killed #t)
 		       (if status 
 			   (if (equal? hostname (get-host-name))
-			       (process-signal pid signal/term)
+			       (process-signal pid signal/term) ;; local machine, send sig term
 			       (debug:print 0 "WARNING: Can't kill a dead server on host " hostname)))
 		       (debug:print-info 1 "Killed server by pid at " hostname ":" port)))
 		 ;; (if zmq-socket (close-socket  zmq-socket))
 		 (format #t fmtstr id mt-ver pid hostname interface port start-time priority 
 			 (if status "alive" "dead"))))