@@ -20,11 +20,20 @@
 (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
+;; notes:
+;;    1. the uses of .import are needed
+;;    2. the order is important
+;;    
 (declare (uses common))
+(declare (uses commonmod))
+(declare (uses commonmod.import))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
+
 ;; (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses tests))
@@ -40,29 +49,28 @@
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses db))
 (declare (uses dbmod))
-(declare (uses dbmod.import))
+;; (declare (uses dbmod.import))
 (declare (uses rmtmod))
 (declare (uses clientmod))
 (declare (uses servermod))
-(declare (uses commonmod))
-(declare (uses commonmod.import))
-(declare (uses dbfile))
-(declare (uses dbfile.import))
-(declare (uses debugprint))
-;; (declare (uses debugprint.import))
+;; (declare (uses commonmod.import))
+;; (declare (uses dbfile.import))
+;; (declare (uses debugprint))
+;; ;; (declare (uses debugprint.import))
 ;; (declare (uses mtargs))
 ;; (declare (uses mtargs.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import dbmod
-	commonmod
+(import commonmod
 	dbfile
+	
+	dbmod
 	servermod
 	;; debugprint.import
 	;; debugprint
 	)
 
@@ -664,11 +672,11 @@
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
-(debug:setup)
+(debug:setup (args:get-arg "-debug")(args:get-arg "-debug-noprop"))
 
 (if (args:get-arg "-logging")(set! *logging* #t))
 
 ;;(if (debug:debug-mode 3) ;; we are obviously debugging
 ;;    (set! open-run-close open-run-close-no-exception-handling))