@@ -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