Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -232,15 +232,10 @@
 				 (thread-sleep! 1)
 				 (loop))
 			       (begin
 				 (servdat-mode-set! *server-info* 'non-db)
 				 (server-uconn *server-info*))))))))
-
-
-;; What is next?
-
-    
     (cond
      ((and conn                                             ;; conn is NOT a socket, just saying ...
 	   (< (current-seconds) (conndat-expires conn)))
       #t) ;; we are current and good to go - we'll deal elsewhere with a server that was killed or died 
      ((and conn
@@ -1552,11 +1547,11 @@
 	       (apath      *toppath*)
 	       (remdat     *remotedat*)) ;; foundation for future fix
 	  (if *dbstruct-db*
 	      (let* ((dbdat      (db:get-dbdat *dbstruct-db* apath dbfile))
 		     (db         (dbr:dbdat-db dbdat))
-		     (inmem      (dbr:dbdat-db dbdat))
+		     (inmem      (dbr:dbdat-db dbdat))   ;; WRONG
 		     )
 		;; 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 force-sync: #t)
 		;; let's finalize here
@@ -1604,16 +1599,20 @@
     (if (and no-hurry (debug:debug-mode 18))
 	(rmt:print-db-stats))
     (let ((th1 (make-thread
 		(lambda () ;; thread for cleaning up, give it five seconds
 		  (let* ((start-time (current-seconds)))
-		    (if (and *server-info*
-			     *unclean-shutdown*)
-			(begin
-			  (debug:print-info 0 *default-log-port* "Unclean server exit, calling server-shtudown")
-			  (rmt:server-shutdown (servdat-host *server-info*)
-					       (servdat-port *server-info*))))
+		    (if *server-info*
+			(let* ((host (servdat-host *server-info*))
+			       (port 	       (servdat-port *server-info*)))
+			  (debug:print-info 0 *default-log-port* "Shutting down server/responder.")
+			  ;;
+			  ;; TODO - add flushing/waiting on the work queue
+			  ;;
+			  (rmt:server-shutdown host port)
+			  (portlogger:open-run-close portlogger:set-port port "released")))
+				
 		    (debug:print-info 0 *default-log-port* "Shutdown activities completed in "(- (current-seconds) start-time)" seconds"))
 		  ;; (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
 		  #;(if (bdat-task-db *bdat*)    ;; TODO: Check that this is correct for task db
 		  (let ((db (cdr (bdat-task-db *bdat*))))
 		  (if (sqlite3:database? db)
@@ -1705,12 +1704,12 @@
   (let* ((host (servdat-host *servdat-info*))
 	 (port (servdat-port *servdat-info*))
 	 (mode (or (servdat-mode *servdat-mode*)
 		   "non-db")))
       ;; server exit stuff here
-      (rmt:server-shutdown host port)
-      (portlogger:open-run-close portlogger:set-port port "released") ;; done in rmt:run
+      ;; (rmt:server-shutdown host port) - always do in on-exit
+      ;; (portlogger:open-run-close portlogger:set-port port "released") ;; moved to on-exit 
       (debug:print-info 0 *default-log-port* "Server "host":"port" mode "mode"shutdown complete. Exiting")
       ))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
@@ -2090,14 +2089,14 @@
 	 (server-key        (rmt:get-signature)) ;; This servers key
 	 (is-main           (equal? (args:get-arg "-db") ".db/main.db"))
 	 (last-access       0)
 	 (server-timeout    (server:expiration-timeout))
 	 (shutdown-server-sequence (lambda (host port)
-				     (set! *unclean-shutdown* #f)
+				     (set! *unclean-shutdown* #f) ;; Should not be needed anymore
 				     (debug:print-info 0 *default-log-port* "Starting to shutdown the server. pid="(current-process-id))
-				     (rmt:server-shutdown host port)
-				     (portlogger:open-run-close portlogger:set-port port "released")
+				     ;; (rmt:server-shutdown host port) -- called in on-exit
+				     ;; (portlogger:open-run-close portlogger:set-port port "released") called in on-exit
 				     (exit)))
 	 (timed-out?        (lambda ()
 			      (<= (+ last-access server-timeout)
 				  (current-seconds)))))
     (servdat-dbfile-set! *server-info* (args:get-arg "-db"))