Index: launchmod.scm
==================================================================
--- launchmod.scm
+++ launchmod.scm
@@ -2249,16 +2249,15 @@
   (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
 		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
 		     #f))
 	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
     (if (and cfgf
-	     (common:file-exists? cfgf)
+	     (file-exists? cfgf)
 	     (file-writable? cfgf)
 	     (common:use-cache?))
-	(configf:read-alist cfgf)
-	(let* ((gotit  (if cfgf #t (launch:setup)))  ;; whatever
-	       (keys   (common:get-fields cfgf))     ;; (rmt:get-keys))
+	(configf:read-alist cfgf) ;; use the cached file
+	(let* ((keys   (common:get-fields *configdat*))     ;; (rmt:get-keys))
 	       (target (common:args-get-target))
 	       (key-vals (if target (keys:target->keyval keys target) #f))
 	       (sections (if target (list "default" target) #f))
 	       (data     (begin
 			   (setenv "MT_RUN_AREA_HOME" *toppath*)
@@ -2265,23 +2264,23 @@
 			   (if key-vals
 			       (for-each (lambda (kt)
 					   (setenv (car kt) (cadr kt)))
 					 key-vals))
 			   ;; (configf:read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
-                           (runconfig:read (conc *toppath* "/runconfigs.config") target #f))))
+			   (runconfig:read (conc *toppath* "/runconfigs.config") target #f))))
 	  (if (and rundir ;; have all needed variabless
 		   (directory-exists? rundir)
 		   (file-writable? rundir))
 	      (begin
-                (if (not (common:in-running-test?))
-                    (configf:write-alist data cfgf))
+		(if (not (common:in-running-test?))
+		    (configf:write-alist data cfgf))
 		;; force re-read of megatest.config - this resolves circular references between megatest.config
 		(launch:setup force-reread: #t)
 		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
 		)) ;; we can safely cache megatest.config since we have a valid runconfig
 	  data))))
-     
+
 ;;======================================================================
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (define (common:watchdog)
   (debug:print-info 13 *default-log-port* "common:watchdog entered.")
   (if (launch:setup)