@@ -38,17 +38,15 @@
 (declare (uses configf))
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
-(declare (uses dashboard-guimonitor))
 (declare (uses tree))
 (declare (uses dcommon))
 (declare (uses dashboard-context-menu))
 (declare (uses vg))
 (declare (uses subrun))
-;; (declare (uses dashboard-main))
 (declare (uses mt))
 (declare (uses dbfile))        
 
 (include "common_records.scm")
 (include "db_records.scm")
@@ -64,47 +62,39 @@
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version 
               " license GPL, Copyright (C) Matt Welland 2012-2017
 
 Usage: dashboard [options]
   -h                    : this help
-  -test run-id,test-id  : control test identified by testid
+  -test run-id test-id  : open a test control panel on this test
   -skip-version-check   : skip the version check
-  -use-db-cache         : access database via cache 
-
-Misc
   -rows R         : set number of rows
   -cols C         : set number of columns
+  -start-dir dir  : start dashboard in the given directory
+  -target target   : filter runs tab to given target.
+  -run-name name  : filter runs tab to given run name.
+  -debug  n[,n]   : set debug level(s) e.g. -debug 4 or -debug 0,9
+  -repl           : Start a chicken scheme interpreter
 "
 ))
 
-;;   -server host:port     : connect to host:port instead of db access
-;;   -xterm run-id,test-id : Start a new xterm with specified run-id and test-id
-;;   -guimonitor           : control panel for runs
 
 ;; process args
 (define remargs (args:get-args 
 		 (argv)
+                 ;; parameters (need arguments)
 		 (list  "-rows"
 			"-cols"
-			"-run"
-			"-test"
-                        "-xterm"
-			"-debug"
-			"-host" 
-			"-transport"
-                        "-start-dir"
-			) 
-		 (list  "-h"
-			"-use-server"
-			"-guimonitor"
-			"-main"
-			"-v"
-			"-q"
-			"-use-db-cache"
+			"-test" ;; given a run id and test id, open only a test control panel on that test..
+			"-debug"
+                        "-start-dir"
+                        "-target"
+                        "-run-name"
+			) 
+                 ;; switches (don't take arguments)
+		 (list  "-h"
 			"-skip-version-check"
 			"-repl"
-                        "-rh5.11" ;; fix to allow running on rh5.11
 			"-:p"     ;; ignore the built in chicken profiling switch
 			)
 		 args:arg-hash
 		 0))
 
@@ -122,13 +112,21 @@
 		'("MT_RUN_AREA_HOME" "MT_MEGATEST" "MT_CMDINFO" "MT_TEST_RUN_DIR" "MT_LINKTREE" "MT_TESTSUITENAME"))
     )
 )
 
 (if (not (null? remargs))
+  (if remargs
     (begin
       (print "Unrecognised arguments: " (string-intersperse remargs " "))
-      (exit)))
+      (exit)
+    )
+    (begin
+      (print help)
+      (exit)
+    )
+  )
+)
 
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
@@ -151,19 +149,19 @@
       (exit 1)))
 
 ;; deal with RH 5.11 gtk lib or iup lib missing detachbox feature
 ;; first check for the switch
 ;;
-(if (or (args:get-arg "-rh5.11")
+(if (or 
 	(configf:lookup *configdat* "dashboard" "no-detachbox")
         (not (file-exists? "/etc/os-release")))
     (set! iup:detachbox iup:vbox))
 
 (if (not (common:on-homehost?))
     (begin
       (debug:print 0 *default-log-port* "WARNING: You are starting the dashboard on a machine that is not the homehost:" (common:get-homehost))
-      (debug:print 0 *default-log-port* "It will be slower." (common:get-homehost))
+      (debug:print 0 *default-log-port* "It will be slower.")
       ))
 
 ;; ########################### end top level code ##############################
 
     
@@ -3847,12 +3845,10 @@
 		   (>= test-id 0))
 	      (dashboard-tests:examine-test run-id test-id)
 	      (begin
 		(debug:print 3 *default-log-port* "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test"))
 		(exit 1)))))
-       ;; ((args:get-arg "-guimonitor")
-       ;;  (gui-monitor (dboard:tabdat-dblocal tabdat)))
        (else
 	(dboard:commondat-uidat-set! commondat (make-dashboard-buttons commondat))
 	(dboard:commondat-curr-tab-num-set! commondat 0)
 	(dboard:commondat-add-updater 
 	 commondat