Index: apimod.scm
==================================================================
--- apimod.scm
+++ apimod.scm
@@ -200,10 +200,11 @@
     ;; SERVERS
     ;; ((start-server)                    (apply server:kind-run params))
     ((kill-server)                       (set! *server-run* #f))
     ((get-server)                        (api:start-server dbstruct params))
     ((register-server)                   (apply db:register-server dbstruct params) );; dbstruct host port servkey pid ipaddr dbpath)
+    ((deregister-server)                 (apply db:deregister-server dbstruct params) );; dbstruct host port servkey pid ipaddr dbpath)
 
     ;; TESTS
 
     ;;((test-set-state-status-by-id)     (apply mt:test-set-state-status-by-id dbstruct params))
     ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items.

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -421,18 +421,19 @@
 	 (db          (dbr:dbdat-db dbdat))
 	 (inmem       (dbr:dbdat-inmem dbdat))
 	 (start-t     (current-seconds))
 	 (last-update (dbr:dbdat-last-write dbdat))
 	 (last-sync   (dbr:dbdat-last-sync dbdat)))
-    (debug:print-info 0 *default-log-port* "Syncing for dbfile: " dbfile)
+    (debug:print-info 0 *default-log-port* "Syncing for dbfile: "dbfile", last-update: "last-update", last-sync: "last-sync)
     (mutex-lock! *db-multi-sync-mutex*)
     (let* ((update_info (cons (if force-sync 0 last-update) "last_update"))
     	   (need-sync   (or force-sync (>= last-update last-sync))))
        (if need-sync
-	  (db:sync-tables (db:sync-all-tables-list) update_info inmem db)
+	   (begin
+	     (db:sync-tables (db:sync-all-tables-list) update_info inmem db)
+	     (dbr:dbdat-last-sync-set! dbdat start-t))
 	  (debug:print 0 *default-log-port* "Skipping sync as nothing touched.")))
-    (dbr:dbdat-last-sync-set! dbdat start-t)
     (mutex-unlock! *db-multi-sync-mutex*)))
 
 ;; TODO: Add final sync to this
 ;;
 (define (db:safely-close-sqlite3-db db stmt-cache #!key (try-num 3))
@@ -798,11 +799,11 @@
        (lambda (dat)
 	 (let ((tblname (car dat))
 	       (count   (cdr dat)))
 	   (set! tot-count (+ tot-count count))
 	   (if (> count 0)
-	       (if should-print (debug:print 0 *default-log-port* (format #f "    ~10a ~5a" tblname count))))))
+	       (if should-print (debug:print 0 *default-log-port* "   "tblname" "count))))) ;; (format #f "    ~10a ~5a" tblname count))))))
        (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b))))))
     tot-count))
 
 (define (db:patch-schema-rundb frundb)
   ;;
@@ -5536,10 +5537,30 @@
 		#f) ;; server already registered
 	      (begin
 		(sqlite3:execute db "INSERT INTO servers (host,port,servkey,pid,ipaddr,apath,dbname) VALUES (?,?,?,?,?,?,?);"
 				 host port servkey pid ipaddr apath dbname)
 		(db:get-server-info dbstruct apath dbname)))))))))
+  
+;; run this one in a transaction where first check if host:port is taken
+(define (db:deregister-server dbstruct host port servkey pid ipaddr apath dbname)
+  (db:with-db
+   dbstruct
+   #f #f
+   (lambda (db)
+     (sqlite3:with-transaction
+      db
+      (lambda ()
+	(let* ((sinfo      (db:get-server-info dbstruct apath dbname)))
+	  (if (not sinfo)
+	      (begin
+		(debug:print-info 0 *default-log-port* "Server already removed for "apath", "dbname) ;; at "sinfo ", while trying to register server " host":"port)
+		#f) ;; server already deregistered
+	      (begin
+		(sqlite3:execute db "DELETE FROM servers WHERE apath=? AND dbname=?;" ;; (host,port,servkey,pid,ipaddr,apath,dbname) VALUES (?,?,?,?,?,?,?);"
+				 ;; host port servkey pid ipaddr
+				 apath dbname)
+		#;(db:get-server-info dbstruct apath dbname)))))))))
   
 (define (db:get-server-info dbstruct apath dbname)
   (db:with-db
    dbstruct
    #f #f

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -1477,17 +1477,18 @@
     (let ((th1 (make-thread
 		(lambda () ;; thread for cleaning up, give it five seconds
 		  (let* ((start-time (current-seconds)))
 		    (if *server-info*
 			(let ((dbfile   (servdat-dbfile *server-info*)))
+			  (debug:print-info 0 *default-log-port* "dbfile is "dbfile)
 			  (if dbfile
 			      (let* ((am-server  (args:get-arg "-server"))
 				     (dbfile     (args:get-arg "-db"))
 				     (apath      *toppath*))
 				;; do a final sync here
 				(debug:print-info 0 *default-log-port* "Doing final sync for "apath" "dbfile" at "(current-seconds))
-				(db:sync-inmem->disk *dbstruct-db* apath dbfile)
+				(db:sync-inmem->disk *dbstruct-db* apath dbfile force-sync: #t)
 				(if am-server
 				    (if (string-match ".*/main.db$" dbfile)
 					(let ((pkt-file (conc (get-pkts-dir *toppath*)
 							      "/" (servdat-uuid *server-info*)
 							      ".pkt")))
@@ -1986,10 +1987,22 @@
 					    ,server-key
 					    ,(current-process-id)
 					    ,iface
 					    ,apath
 					    ,dbname)))
+
+(define (rmt:deregister-server remote apath iface port server-key dbname)
+  (rmt:open-main-connection remote apath) ;; we need a channel to main.db
+  (rmt:send-receive-real remote apath      ;; params: host port servkey pid ipaddr dbpath
+			 (db:run-id->dbname #f)
+			 'deregister-server `(,iface
+					      ,port
+					      ,server-key
+					      ,(current-process-id)
+					      ,iface
+					      ,apath
+					      ,dbname)))
 
 (define (http-transport:wait-for-stable-interface #!optional (num-tries-allowed 100))
   ;; wait until *server-info* stops changing
   (let* ((stime (current-seconds)))
     (let loop ((last-host  #f)
@@ -2119,16 +2132,18 @@
 		(debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)))
 	    (loop 0 bad-sync-count (current-milliseconds)))
 	   (else
 	    (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access))
 	    (if (not (string-match ".db/main.db" (args:get-arg "-db")))
-		(let* ((res (rmt:send-receive 'deregister-server #f
-					      `(,(servdat-uuid sdat)
-						,(current-process-id)
-						,(servdat-host sdat)   ;; iface
-						,(servdat-port sdat)))))
-		(debug:print-info 0 *default-log-port* "deregistered-server, res="res)))
+		(let* ((res (rmt:deregister-server *rmt:remote* ;; TODO/BUG: why is this requiring *rmt:remote*?
+						   *toppath*
+						   (servdat-host *server-info*)   ;; iface
+						   (servdat-port *server-info*)
+						   (servdat-uuid *server-info*)
+						   (current-process-id)
+						   )))
+		  (debug:print-info 0 *default-log-port* "deregistered-server, res="res)))
 	    (http-transport:server-shutdown port))))))))
 
 (define (http-transport:server-shutdown port)
   (begin
     ;;(BB> "http-transport:server-shutdown called")

Index: tests/unittests/server.scm
==================================================================
--- tests/unittests/server.scm
+++ tests/unittests/server.scm
@@ -32,13 +32,13 @@
 ;;  rmt:send-receive-real
 ;;  rmt:send-receive
  ;; sexpr->string
  ;; server-ready?
  ;; rmt:register-server
- rmt:open-main-connection
- rmt:general-open-connection
- rmt:get-conn
+ ;; rmt:open-main-connection
+ ;; rmt:general-open-connection
+ ;; rmt:get-conn
  ;; common:watchdog
  ;; rmt:find-main-server
  ;; get-all-server-pkts
  ;; get-viable-servers
  ;; get-best-candidate