Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -21,11 +21,11 @@
 PREFIX=$(PWD)/tmpinstall
 
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm \
    ods.scm runconfig.scm server.scm \
-   db.scm keys.scm margs.scm megatest-version.scm \
+   db.scm keys.scm megatest-version.scm \
    process.scm runs.scm tasks.scm tests.scm genexample.scm \
    http-transport.scm filedb.scm tdb.scm \
    client.scm mt.scm \
    ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm subrun.scm \
@@ -47,11 +47,11 @@
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 MOFILES = $(MSRCFILES:%.scm=%.o)
 
-
+CHICKEN_NUMBER = $(shell csi -e '(print (car (reverse (string-split  (repository-path) "/"))))')
 
 %.o : %.scm ../adat.scm $(MTEGGS)
 	csc $(CSCOPTS) -J -c $< -o $*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
@@ -58,12 +58,12 @@
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
 
 MT_EGGS_BASE=$(PREFIX)/eggs
-MT_EGGS_DIR=$(MT_EGGS_BASE)/lib/chicken/7
-MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so $(MT_EGGS_DIR)/mtdebug.so
+MT_EGGS_DIR=$(MT_EGGS_BASE)/lib/chicken/$(CHICKEN_NUMBER)
+MTEGGS=$(MT_EGGS_DIR)/mtconfigf.so $(MT_EGGS_DIR)/mtdebug.so $(MT_EGGS_DIR)/mtargs.so
 CHICKEN_REPOSITORY=$(MT_EGGS_DIR)
 export CHICKEN_REPOSITORY
 #CSCOPTS=-Wl,-rpath,$(MT_EGGS_DIR)
 
 
@@ -82,10 +82,12 @@
 # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
 ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 PNGFILES = $(shell cd docs/manual;ls *png)
+
+$(MOFILES): $(MTEGGS) $(MT_EGGS_DIR)/types.db
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut eggs
 
 mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MTEGGS)
@@ -129,11 +131,10 @@
 	http-transport.o \
 	items.o \
 	keys.o \
 	launch.o \
 	lock-queue.o \
-	margs.o \
 	mt.o \
 	megatest-version.o \
 	ods.o \
 	portlogger.o \
 	process.o \
@@ -205,12 +206,12 @@
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 tests.o tasks.o dashboard-tasks.o : task_records.scm
 runs.o : test_records.scm
 megatest.o : megatest-fossil-hash.scm
-rmt.scm client.scm common.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm $(MTEGGS)
-common_records.scm : altdb.scm modules.scm
+rmt.scm client.scm common.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm $(MTEGGS) $(MT_EGGS_DIR)/types.db
+common_records.scm : altdb.scm modules.scm 
 vg.o dashboard.o : vg_records.scm
 dcommon.o : run_records.scm
 # Temporary while transitioning to new routine
 # runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
 
@@ -357,11 +358,12 @@
 
 clean : 
 	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest \
         $(PREFIX)/dashboard mtest mtutil dboard dboard.o megatest.o dashboard.o \
         megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o mtut.o \
-	*.import.scm mofiles/*.import.scm *.bak *~ *-original *-merge *-baseline
+	*.import.scm mofiles/*.import.scm *.bak *~ *-original *-merge *-baseline \
+        rm -rf $(PREFIX)/*
 
 #======================================================================
 # Make the records files
 #======================================================================
 
@@ -415,18 +417,18 @@
 
 xterm : sd
 	(export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &)
 
 datashare-testing/spublish : spublish.scm $(OFILES) modules.scm
-	csc $(CSCOPTS) spublish.scm  megatest-version.o margs.o process.o common.o  -o datashare-testing/spublish
+	csc $(CSCOPTS) spublish.scm  megatest-version.o  process.o common.o  -o datashare-testing/spublish
 
 datashare-testing/sretrieve : sretrieve.scm $(OFILES) modules.scm
-	csc $(CSCOPTS) sretrieve.scm  megatest-version.o margs.o process.o common.o  -o datashare-testing/sretrieve
+	csc $(CSCOPTS) sretrieve.scm  megatest-version.o process.o common.o  -o datashare-testing/sretrieve
 
 
 datashare-testing/sauthorize : sauthorize.scm $(OFILES) modules.scm
-	 csc $(CSCOPTS) sauthorize.scm  megatest-version.o margs.o process.o common.o  -o datashare-testing/sauthorize
+	 csc $(CSCOPTS) sauthorize.scm  megatest-version.o process.o common.o  -o datashare-testing/sauthorize
 
 sauth-init:
 	mkdir -p  datashare-testing
 	rm  datashare-testing/sauthorize
 	rm  datashare-testing/sretrieve 
@@ -456,12 +458,12 @@
 	fi
 	if csi -ne '(use postgresql)';then \
 	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
-portlogger-example : portlogger-example.scm api.o archive.o client.o common.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
-	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+portlogger-example : portlogger-example.scm api.o archive.o client.o common.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 
 # create a pdf dot graphviz diagram from notations in rmt.scm
 rmt.pdf : rmt.scm
 	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -58,11 +58,12 @@
     fullpath))
 (define *common:this-exe-fullpath* (common:get-this-exe-fullpath))
 (define *common:this-exe-dir*      (pathname-directory *common:this-exe-fullpath*))
 (define *common:this-exe-name*     (pathname-strip-directory *common:this-exe-fullpath*))
 
-(let* ((libpath (conc *common:this-exe-dir* "/../../eggs/lib/chicken/7")))
+(let* ((libpath-number (car (reverse (string-split  (repository-path) "/"))))
+       (libpath (conc *common:this-exe-dir* "/../../eggs/lib/chicken/" libpath-number)))
   (if (and (not (get-environment-variable "CHICKEN_REPOSITORY"))
            (directory-exists? libpath))
       (repository-path libpath)))
 
 

Index: modules.scm
==================================================================
--- modules.scm
+++ modules.scm
@@ -22,11 +22,11 @@
 (use (prefix mtconfigf configf:))
 
 ;; configure mtdebug  ;; TODO: move to megatest.scm with other command line arg processing
 (if (args:get-arg "-v")     (debug:set-verbose-mode))
 (if (args:get-arg "-q")     (debug:set-quiet-mode))
-(if (args:get-arg "-debug") (debug:set-debug-mode))
+(if (args:get-arg "-debug") (debug:set-verbosity (args:get-arg "-debug")))
 (if (args:get-arg "-color")
     (case (string->symbol (args:get-arg "-color"))
       ((y Y yes YES t T)  (debug:force-color))
       ((n N no NO f F)    (debug:suppress-color))))
 
@@ -36,12 +36,8 @@
        (info-fn   debug:print-info)
        (error-fn  debug:print-error)
        (default-port *default-log-port*))
   (configf:set-debug-printers normal-fn info-fn error-fn default-port))
 
-(define *add-eval-string-check* #f)
-(cond
- ((not *add-eval-string-check*)
-  (configf:add-eval-string "(import (prefix mtargs    args:))
+(configf:add-eval-string "(import (prefix mtargs    args:))
                           (import mtdebug)
                           (import (prefix mtconfigf configf:))")
-  (set! *add-eval-string-check* #t)))