@@ -432,11 +432,12 @@
     (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
       (debug:print 0 "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
       (hash-table-set! args:arg-hash "-testpatt" newval)
       (hash-table-delete! args:arg-hash "-itempatt")))
 
-(on-exit std-exit-procedure)
+(on-exit (lambda ()
+	   (std-exit-procedure *area-dat*)))
 
 ;;======================================================================
 ;; Misc general calls
 ;;======================================================================
 
@@ -451,11 +452,11 @@
        (string-intersperse 
 	(map (lambda (x)
 	       (string-intersperse 
 		x
 		" => "))
-	     (common:get-disks *configdat*))
+	     (common:get-disks (megatest:area-configdat *area-dat*)))
 	"\n"))
       (set! *didsomething* #t)))
 
 (define (make-sparse-array)
   (let ((a (make-sparse-vector)))
@@ -636,18 +637,10 @@
 (if (args:get-arg "-ping")
     (let* ((run-id        (string->number (args:get-arg "-run-id")))
 	   (host:port     (args:get-arg "-ping")))
       (server:ping run-id host:port)))
 
-;;       (set! *did-something* #t)
-;; 	      (begin
-;; 		(print ((rpc:procedure 'testing (car host-port)(cadr host-port))))
-;; 		(case (server:get-transport)
-;; 		  ((http)(http:ping run-id host-port))
-;; 		  ((rpc) (rpc:procedure 'server:login (car host-port)(cadr host-port));;  *toppath*)) ;; (rpc-transport:ping  run-id (car host-port)(cadr host-port)))
-;; 		  (else  (debug:print 0 "ERROR: No transport set")(exit)))))
-
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
 
@@ -676,11 +669,11 @@
 		       "-list-runs"
 		       "-ping")))
 	(if (launch:setup-for-run *area-dat*)
 	    (let ((run-id    (and (args:get-arg "-run-id")
 				  (string->number (args:get-arg "-run-id")))))
-	      ;; (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
+	      ;; (set! *fdb*   (filedb:open-db (conc toppath "/db/paths.db")))
 	      ;; if not list or kill then start a client (if appropriate)
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
 		  (debug:print-info 1 "Server connection not needed")
 		  (begin
@@ -689,11 +682,11 @@
 		    ;;     (client:launch 0)      ;; without run-id we'll start a server for "0"
 		    #t
 		    ))))))
 
 ;; MAY STILL NEED THIS
-;;		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
+;;		       (set! *megatest-db* (make-dbr:dbstruct path: toppath local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
     (let ((tl (launch:setup-for-run *area-dat*)))
       (if tl 
@@ -754,28 +747,29 @@
 		  ;; (print "[" x "]"))
 		  (print x))
 		targets)
       (set! *didsomething* #t)))
 
-(define (full-runconfigs-read)
-  (let* ((keys   (rmt:get-keys))
-	 (target (common:args-get-target))
+(define (full-runconfigs-read area-dat)
+  (let* ((toppath  (megatest:area-path area-dat))
+	 (keys     (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*)
+		     (setenv "MT_RUN_AREA_HOME" toppath)
 		     (if key-vals
 			 (for-each (lambda (kt)
 				     (setenv (car kt) (cadr kt)))
 				   key-vals))
-		     (read-config (conc *toppath* "/runconfigs.config") #f #t sections: sections))))
+		     (read-config (conc toppath "/runconfigs.config") #f #t sections: sections))))
     data))
 
 
 (if (args:get-arg "-show-runconfig")
     (let ((tl (launch:setup-for-run *area-dat*)))
-      (push-directory *toppath*)
+      (push-directory (megatest:area-path *area-dat*))
       (let ((data (full-runconfigs-read)))
 	;; keep this one local
 	(cond
 	 ((and (args:get-arg "-section")
 	       (args:get-arg "-var"))
@@ -790,12 +784,12 @@
 	(set! *didsomething* #t))
       (pop-directory)))
 
 (if (args:get-arg "-show-config")
     (let ((tl   (launch:setup-for-run *area-dat*))
-	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
-      (push-directory *toppath*)
+	  (data (megatest:area-configdat *area-dat*)))
+      (push-directory (megatest:area-path *area-dat*))
       ;; keep this one local
       (cond 
        ((and (args:get-arg "-section")
 	     (args:get-arg "-var"))
 	(let ((val (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))))
@@ -822,13 +816,14 @@
 ;; Remove old run(s)
 ;;======================================================================
 
 ;; since several actions can be specified on the command line the removal
 ;; is done first
-(define (operate-on action)
-  (let* ((runrec (runs:runrec-make-record))
-	 (target (common:args-get-target)))
+(define (operate-on action area-dat)
+  (let* ((runrec     (runs:runrec-make-record))
+	 (target     (common:args-get-target))
+	 (configinfo (megatest:area-configinfo area-dat)))
     (cond
      ((not target)
       (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify -target or -reqtarg")
       (exit 1))
      ((not (or (args:get-arg ":runname")
@@ -837,19 +832,20 @@
       (exit 2))
      ((not (args:get-arg "-testpatt"))
       (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify the test pattern with -testpatt")
       (exit 3))
      (else
-      (if (not (car *configinfo*))
+      (if (not (car configinfo))
 	  (begin
 	    (debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found")
 	    (exit 1))
 	  ;; put test parameters into convenient variables
 	  (runs:operate-on  action
 			    target
 			    (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			    (args:get-arg "-testpatt")
+			    area-dat
 			    state: (or (args:get-arg "-state")(args:get-arg ":state") )
 			    status: (or (args:get-arg "-status")(args:get-arg ":status"))
 			    new-state-status: (args:get-arg "-set-state-status")))
       (set! *didsomething* #t)))))
 	  
@@ -899,11 +895,11 @@
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
     (if (launch:setup-for-run *area-dat*)
-	(let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t))
+	(let* ((dbstruct (make-dbr:dbstruct path: (megatest:area-path *area-dat*) local: #t))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
 	       (keys     (db:get-keys dbstruct))
@@ -1174,11 +1170,11 @@
 (if (args:get-arg "-extract-ods")
     (general-run-call
      "-extract-ods"
      "Make ods spreadsheet"
      (lambda (target runname keys keyvals)
-       (let ((dbstruct   (make-dbr:dbstruct path: *toppath* local: #t))
+       (let ((dbstruct   (make-dbr:dbstruct path: (megatest:area-path *area-dat*) local: #t))
 	     (outputfile (args:get-arg "-extract-ods"))
 	     (runspatt   (or (args:get-arg "-runname")(args:get-arg ":runname")))
 	     (pathmod    (args:get-arg "-pathmod")))
 	     ;; (keyvalalist (keys->alist keys "%")))
 	 (debug:print 2 "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)