@@ -25,14 +25,16 @@
 
 (declare (uses adjutant))
 (declare (uses archivemod))
 (declare (uses apimod))
 (declare (uses autoload))
+(declare (uses bigmod))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses dbmod))
 (declare (uses dbi))
+(declare (uses debugprint))
 (declare (uses ducttape-lib))
 (declare (uses ezstepsmod))
 (declare (uses http-transportmod))
 (declare (uses launchmod))
 (declare (uses mtargs))
@@ -41,10 +43,20 @@
 (declare (uses processmod))
 (declare (uses rmtmod))
 (declare (uses runsmod))
 (declare (uses servermod))
 (declare (uses testsmod))
+
+;; needed for configf scripts, scheme etc.
+(declare (uses apimod.import))
+(declare (uses debugprint.import))
+(declare (uses mtargs.import))
+(declare (uses commonmod.import))
+(declare (uses configfmod.import))
+(declare (uses bigmod.import))
+(declare (uses dbmod.import))
+(declare (uses rmtmod.import))
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*
@@ -51,10 +63,11 @@
 
   (import scheme
 	  chicken.base
 	  chicken.bitwise
 	  chicken.condition
+	  chicken.eval
 	  chicken.file
 	  chicken.file.posix
 	  chicken.format
 	  chicken.io
 	  chicken.irregex
@@ -71,41 +84,41 @@
 	  chicken.string
 	  chicken.tcp
 	  chicken.time
 	  chicken.time.posix
 	  
-	  (prefix sqlite3 sqlite3:)
 	  (prefix base64 base64:)
+	  (prefix sqlite3 sqlite3:)
+	  (prefix sxml-modifications sxml-)
 	  address-info
 	  csv-abnf
 	  directory-utils
 	  fmt
+	  http-client
+	  intarweb
 	  json
+	  linenoise
 	  matchable
 	  md5
 	  message-digest
 	  queues
 	  regex
 	  regex-case
-	  sql-de-lite
-	  stack
-	  typed-records
 	  s11n
 	  sparse-vectors
-	  sxml-serializer
+	  spiffy
+	  spiffy-directory-listing
+	  spiffy-request-vars
+	  sql-de-lite
+	  stack
 	  sxml-modifications
-	  (prefix sxml-modifications sxml-)
+	  sxml-serializer
 	  sxml-transforms
 	  system-information
-	  z3
-	  spiffy
+	  typed-records
 	  uri-common
-	  intarweb
-	  http-client
-	  spiffy-request-vars
-	  intarweb
-	  spiffy-directory-listing
+	  z3
 	  
 	  srfi-1
 	  srfi-4
 	  srfi-18
 	  srfi-13
@@ -126,12 +139,13 @@
 	  (prefix mtargs args:)
 	  pkts
 	  stml2
 	  (prefix dbi dbi:)
 
-	  ;; apimod
+	  apimod
 	  archivemod
+	  bigmod
 	  commonmod
 	  configfmod
 	  dbmod
 	  debugprint
 	  ezstepsmod
@@ -139,11 +153,11 @@
 	  launchmod
 	  processmod
 	  rmtmod
 	  runsmod
 	  servermod
-	  ;; tasksmod
+	  tasksmod
 	  testsmod
 	  
 	  )
 	
 ;; fake out readline usage of toplevel-command
@@ -2444,11 +2458,31 @@
      	    (begin
      	      (set! *db* dbstruct)
      	      ;; (import extras) ;; might not be needed
      	      ;; (import csi)
      	      ;; (import readline)
-     	      (import apropos)
+     	      (import apropos
+		      archivemod
+		      commonmod
+		      configfmod
+		      dbmod
+		      debugprint
+		      ezstepsmod
+		      http-transportmod
+		      launchmod
+		      processmod
+		      rmtmod
+		      runsmod
+		      servermod
+		      tasksmod
+		      testsmod)
+
+	      (set-history-length! 300)
+	      
+	      (load-history-from-file ".megatest_history")
+	      
+	      (current-input-port (make-linenoise-port))
      	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
      
      	;; (if *use-new-readline*
      	;; 	  (begin
      	;; 	    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])