@@ -44,11 +44,11 @@
 ;; if a server is either running or in the process of starting call client:setup
 ;; else return #f to let the calling proc know that there is no server available
 ;;
 (define (rmt:get-connection-info areapath runremote) ;; TODO: push areapath down.
   (let* ((cinfo     (if (remote? runremote)
-			(remote-conndat runremote)
+			(remote-api-req runremote)
 			#f)))
 	  (if cinfo
 	      cinfo
 	      (if (server:check-if-running areapath)
 		  (client:setup areapath runremote)
@@ -114,12 +114,12 @@
 	(begin
 	  (set! *runremote* (make-remote))
           (let* ((server-info (remote-server-info *runremote*))) 
             (if server-info
 		(begin
-			(remote-server-url-set! *runremote* (server:record->url server-info))
-			(remote-server-id-set! *runremote* (server:record->id server-info)))))  
+		  (remote-server-url-set! *runremote* (server:record->url server-info))
+		  (remote-server-id-set! *runremote* (server:record->id server-info)))))
 	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
     
     ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
     ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
     ;; DOT SET_HOMEHOST -> MUTEXLOCK;
@@ -129,16 +129,16 @@
 	(let ((hh-data (server:choose-server areapath 'homehost)))
 	  (remote-hh-dat-set! runremote (or hh-data (cons #f #f)))))
     
     ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
     (cond
-     #;((> (- (current-seconds)(remote-connect-time runremote)) 180) ;; reconnect to server every 180 seconds
-      (debug:print 0 *default-log-port* "Forcing reconnect to server(s) due to 180 second timeout.")
-      (set! *runremote* #f)
-      ;; BUG: close-connections should go here?
-      (mutex-unlock! *rmt-mutex*)
-      (rmt:send-receive cmd rid params attemptnum: 1 area-dat: area-dat))
+     ;; ((> (- (current-seconds)(remote-connect-time runremote)) 180) ;; reconnect to server every 180 seconds
+     ;;  (debug:print 0 *default-log-port* "Forcing reconnect to server(s) due to 180 second timeout.")
+     ;;  (set! *runremote* #f)
+     ;;  ;; BUG: close-connections should go here?
+     ;;  (mutex-unlock! *rmt-mutex*)
+     ;;  (rmt:send-receive cmd rid params attemptnum: 1 area-dat: area-dat))
      
      ;;DOT EXIT;
      ;;DOT MUTEXLOCK -> EXIT [label="> 15 attempts"]; {rank=same "case 1" "EXIT" }
      ;; give up if more than 150 attempts
      ((> attemptnum 150)
@@ -176,11 +176,10 @@
 	      (+ (remote-last-access runremote)
 		 (remote-server-timeout runremote))))
       (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
       (http-transport:close-connections runremote)
       ;; moving this setting of runremote conndat to #f to inside the http-transport:close-connections
-      ;; (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
       (mutex-unlock! *rmt-mutex*)
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
      
      ;;DOT CASE5 [label="local\nread"];
      ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
@@ -254,18 +253,18 @@
 
      ;;DOT CASE9 [label="force server\nnot on homehost"];
      ;;DOT MUTEXLOCK -> CASE9 [label="no connection\nand either require server\nor not on homehost"]; {rank=same "case 9" CASE9};
      ;;DOT CASE9 -> "start\nserver" -> "rmt:send-receive";
      ((or (and (remote-force-server runremote)              ;; we are forcing a server and don't yet have a connection to one
-	       (not (remote-conndat runremote)))
+	       (not (remote-api-req runremote)))
 	  (and (not (cdr (remote-hh-dat runremote)))        ;; not on a homehost 
-	       (not (remote-conndat runremote))))           ;; and no connection
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
+	       (not (remote-api-req runremote))))           ;; and no connection
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-api-req runremote))
       (mutex-unlock! *rmt-mutex*)
       (if (not (server:check-if-running *toppath*)) ;; who knows, maybe one has started up?
 	  (server:start-and-wait *toppath*))
-      (remote-conndat-set! runremote (rmt:get-connection-info *toppath* runremote)) ;; calls client:setup which calls client:setup-http
+      (rmt:get-connection-info *toppath* runremote) ;; calls client:setup which calls client:setup-http
       (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
 
      ;;DOT CASE10 [label="on homehost"];
      ;;DOT MUTEXLOCK -> CASE10 [label="server not required,\non homehost"]; {rank=same "case 10" CASE10};
      ;;DOT CASE10 -> "rmt:open-qry-close-locally";