@@ -7,10 +7,12 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
+
+(define (toplevel-command . a) #f)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc ;; (srfi 18) extras)
      http-client srfi-18 extras format) ;;  zmq extras)
 
 ;; Added for csv stuff - will be removed
@@ -888,11 +890,10 @@
 			     "%"))
 	       (keys     (db:get-keys dbstruct))
 	       ;; (runsdat  (db:get-runs dbstruct runpatt #f #f '()))
 	       (runsdat  (db:get-runs-by-patt dbstruct keys (or runpatt "%") (common:args-get-target)
 					 #f #f))
-		;; (cdb:remote-run db:get-runs #f runpatt #f #f '()))
 	       (runs     (db:get-rows runsdat))
 	       (header   (db:get-header runsdat))
 	       (db-targets (args:get-arg "-list-db-targets"))
 	       (seen     (make-hash-table))
 	       (dmode    (let ((d (args:get-arg "-dumpmode")))
@@ -1250,11 +1251,11 @@
 	  ;; can setup as client for server mode now
 	  ;; (client:setup)
 
 	  (if (args:get-arg "-load-test-data")
 	      ;; has sub commands that are rdb:
-	      ;; DO NOT put this one into either cdb:remote-run or open-run-close
+	      ;; DO NOT put this one into either rmt: or open-run-close
 	      (tdb:load-test-data run-id test-id))
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
 		(rmt:test-set-log! run-id test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
@@ -1347,11 +1348,11 @@
 	  (keys #f))
       (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting")
 	    (exit 1)))
-      (set! keys (cdb:remote-run db:get-keys db))
+      (set! keys (rmt:get-keys)) ;;  db))
       (debug:print 1 "Keys: " (string-intersperse keys ", "))
       (if (sqlite3:database? db)(sqlite3:finalize! db))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-gui")
@@ -1430,11 +1431,10 @@
 ;;======================================================================
 ;; Start a repl
 ;;======================================================================
 
 ;; fakeout readline
-(define (toplevel-command . a) #f)
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup-for-run))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
@@ -1445,10 +1445,11 @@
 	    (import extras) ;; might not be needed
 	    ;; (import csi)
 	    (import readline)
 	    (import apropos)
 	    ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+	    (include "readline-fix.scm")
 	    (gnu-history-install-file-manager
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
 	    (current-input-port (make-gnu-readline-port "megatest> "))
 	    (if (args:get-arg "-repl")