@@ -424,10 +424,13 @@
 
                         "-diff-rep"
                         )
 		 args:arg-hash
 		 0))
+
+;;
+
 
 ;; Add args that use remargs here
 ;;
 (if (and (not (null? remargs))
 	 (not (or
@@ -593,10 +596,12 @@
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
+;; setup modules
+(if (args:get-arg "-debug") (debug:set-debug-mode (args:get-arg "-debug")))
 (debug:setup)
 
 (if (args:get-arg "-logging")
     (debug:add-logging-callback db:log-event))
 
@@ -989,12 +994,13 @@
 	  (debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
 	(set! *didsomething* #t))
       (pop-directory)))
 
 (if (args:get-arg "-show-config")
-    (let ((tl   (launch:setup))
+    (let ((tl   (launch:setup keep-filenames: (debug:debug-mode 9)))
 	  (data *configdat*)) ;; (read-config "megatest.config" #f #t)))
+      (BB> "in -show-config: keep-filenames: "(debug:debug-mode 9))
       (push-directory *toppath*)
       ;; keep this one local
       (cond 
        ((and (args:get-arg "-section")
 	     (args:get-arg "-var"))
@@ -1007,11 +1013,11 @@
 	(pp (hash-table->alist data)))
        ((equal? (args:get-arg "-dumpmode") "json")
 	(json-write data))
        ((or (not (args:get-arg "-dumpmode"))
 	    (string=? (args:get-arg "-dumpmode") "ini"))
-	(configf:config->ini data))
+	(configf:config->ini data)  )
        (else
 	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)
       (pop-directory)
       (set! *time-to-exit* #t)))
@@ -2155,11 +2161,11 @@
     (exit 0)))
 
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
-    (let* ((toppath (launch:setup))
+    (let* ((toppath (launch:setup keep-filenames: (debug:debug-mode 9)))
 	   (dbstruct (if (and toppath
                               (common:on-homehost?))
                          (db:setup #t)
                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*