Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -25,11 +25,11 @@
 (define *verbosity-cache* (make-hash-table))
 (define *verbosity* 0)
 (define *default-log-port* (current-error-port))
 (define *logging* #f)
 (define *functions* (make-hash-table)) ;; symbol => fn
-(define *toppath* #f)
+;; (define *toppath* #f)
 (define *transport-type* 'http)
 
 (define (exec-fn fn . params)
   (if (hash-table-exists? *functions* fn)
       (apply (hash-table-ref *functions* fn) params)
@@ -40,16 +40,16 @@
 
 (include "altdb.scm")
 
 
 (defstruct remote
-  (hh-dat            (exec-fn 'common:get-homehost)) ;; homehost record ( addr . hhflag )
-  (server-url        (if *toppath* (exec-fn 'server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
+  (hh-dat            #f) ;; (exec-fn 'common:get-homehost)) ;; homehost record ( addr . hhflag )
+  (server-url        #f) ;; (if *toppath* (exec-fn 'server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
   (last-server-check 0)  ;; last time we checked to see if the server was alive
   (conndat           #f)
   (transport         *transport-type*)
-  (server-timeout    (exec-fn 'server:expiration-timeout))
+  (server-timeout    #f) ;; (exec-fn 'server:expiration-timeout))
   (force-server      #f)
   (ro-mode           #f)  
   (ro-mode-checked   #f) ;; flag that indicates we have checked for ro-mode
   (ulex:conn         #f) ;; ulex db conn is not exactly a db connector, more like a network connector 
   )

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -69,18 +69,21 @@
 			    *runremote*)))
     ;; ensure we have a record for our connection for given area
     (if (not runremote)                   ;; can remove this one. should never get here.         
 	(begin
 	  (set! *runremote* (make-remote))
-	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
+	  (set! runremote   *runremote*)
+	  (remote-server-timeout-set! runremote (server:expiration-timeout))
+	  (remote-hh-dat-set!         runremote (common:get-homehost ))
+	  )) ;; new runremote will come from this on next iteration
     
     (if (member cmd '(blah))
       (begin
 	(mutex-lock! *send-receive-mutex*)
 	(if (not *runremote*)(set! *runremote* (make-remote)))
 	(let ((ulex:conn (remote-ulex:conn *runremote*)))
-	  (if (not ulex:conn)(remote-ulex:conn-set! *runremote* (rmtmod:setup-ulex *toppath*)))
+	  (if (not ulex:conn)(remote-ulex:conn-set! *runremote* (rmtmod:setup-ulex areapath)))
 	  (rmtmod:send-receive-ulex ulex:conn cmd rid params attemptnum area-dat)))
       (rmt:send-receive-orig *default-log-port* runremote *rmt-mutex* areapath *db-multi-sync-mutex* cmd rid params attemptnum: attemptnum area-dat: area-dat ro-queries: api:read-only-queries))))
 
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
@@ -104,11 +107,10 @@
 
 	 (readonly-mode (rmtmod:calc-ro-mode runremote toppath)))
 
     ;; ensure we have a homehost record
     (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
-	(thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
 	(remote-hh-dat-set! runremote (common:get-homehost)))
     
     ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
     (cond
      ;; give up if more than 15 attempts

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -122,21 +122,21 @@
   ;;(mutex-unlock! rmt-mutex)
   (debug:print-info 12 log-port "rmt:send-receive, case 3")
   (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
   #f)
 
-(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
-  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-  ;;(mutex-lock! *rmt-mutex*)
+(define (extras-transport-failed log-port rmt-mutex attemptnum runremote cmd rid params)
+  (debug:print 0 log-port "WARNING: communication failed. Trying again, try num: " attemptnum)
+  ;;(mutex-lock! rmt-mutex)
   (remote-conndat-set!    runremote #f)
   (http-transport:close-connections area-dat: runremote)
   (remote-server-url-set! runremote #f)
-  ;;(mutex-unlock! *rmt-mutex*)
-  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+  ;;(mutex-unlock! rmt-mutex)
+  (debug:print-info 12 log-port "rmt:send-receive, case  9.1")
   (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
   
-(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+(define (extras-transport-succeded log-port rmt-mutex attemptnum runremote res params rid cmd)
   (if (and (vector? res)
 	   (eq? (vector-length res) 2)
 	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
 						 ;; looking at the
 						 ;; data to carry the
@@ -152,15 +152,16 @@
 						 ;; server is
 						 ;; overloaded and we
 						 ;; want to ease off
 						 ;; the queries
       (let ((wait-delay (+ attemptnum (* attemptnum 10))))
-	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
-	;;(mutex-lock! *rmt-mutex*)
+	(debug:print 0 log-port "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
+	;;(mutex-lock! rmt-mutex)
 	(http-transport:close-connections area-dat: runremote)
-	(set! *runremote* #f) ;; force starting over
-	;;(mutex-unlock! *rmt-mutex*)
+	;; (set! *runremote* #f) ;; force starting over
+	(remote-server-url-set! runremote #f) ;; I am hoping this will force a redo on server connection. NOT TESTED
+	;;(mutex-unlock! rmt-mutex)
 	(thread-sleep! wait-delay)
 	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
       res)) ;; All good, return res
 
 ;;======================================================================