Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -232,27 +232,27 @@
 (define *common:this-exe-name*     (pathname-strip-directory *common:this-exe-fullpath*))
 
 ;; when called from a wrapper I need sometimes to find the calling
 ;; wrapper, this is for dashboard to find the correct megatest.
 ;;
-(define (common:find-local-megatest)
+(define (common:find-local-megatest #!optional (progname "megatest"))
   (let ((res (filter file-exists?
 		     (map (lambda (updir)
 			    (let* ((lm  (car (argv)))
 				   (dir (pathname-directory lm))
 				   (exe (pathname-strip-directory lm)))
 			      (conc (if dir (conc dir "/") "")
 				    (case (string->symbol exe)
-				      ((dboard)    (conc updir "megatest"))
-				      ((mtest)     (conc updir "megatest"))
-				      ((dashboard) "megatest")
+				      ((dboard)    (conc updir progname))
+				      ((mtest)     (conc updir progname))
+				      ((dashboard) progname)
 				      (else exe)))))
-			  '("../" "../../")))))
+			  '("../../" "../")))))
     (if (null? res)
 	(begin
 	  (debug:print 0 *current-log-port* "Failed to find this executable! Using what can be found on the path")
-	  "megatest")
+	  progname)
 	(car res))))
 
 (define *common:logpro-exit-code->status-sym-alist*
   '( ( 0 . pass )
      ( 1 . fail )

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -45,20 +45,13 @@
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
 (define (dboard:launch-testpanel run-id test-id)
-  (let* (;; (cfg-sh  (conc *common:this-exe-dir* "/cfg.sh"))
-         ;; (cmd (conc
-         ;;       (if (common:file-exists? cfg-sh)
-         ;;           (conc "source "cfg-sh" && ")
-         ;;           "")
-         ;;       *common:this-exe-fullpath*
-         ;;       " -test " run-id "," test-id
-         ;;       " &"))
-         (cmd (conc *common:this-exe-dir*"/../dashboard "
-                    "-test " run-id "," test-id
+  (let* ((dboardexe (common:find-local-megatest "dashboard"))
+         (cmd (conc dboardexe
+                    " -test " run-id "," test-id
                     " &")))
     (system cmd)))
 
 
 (define (dashboard:run-menu-items  run-id test-id target runname test-name testpatt item-test-path test-info)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -124,11 +124,11 @@
 Launching and managing runs
   -run                    : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
                             Optionally use :state and :status, use -keep-records to remove only
                             the run data. Use -kill-wait to override the 10 second
-                            per test wait after kill delay. 
+                            per test wait after kill delay (e.g. -kill-wait 0). 
   -kill-runs              : kill existing run(s) (all incomplete tests killed)
   -kill-rerun             : kill an existing run (all incomplete tests killed and run is rerun)
   -set-state-status X,Y   : set state to X and status to Y, requires controls per -remove-runs
   -rerun FAIL,WARN...     : force re-run for tests with specificed status(s)
   -rerun-clean            : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2339,12 +2339,11 @@
                                             (loop (car tal)(append tal (list new-test-dat)))))
                                       (begin
                                         (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
                                         (if (file-exists? lasttpath) 
                                           (set! lastrealpath (resolve-pathname lasttpath))
-                                          (set! lastrealpath lasttpath)
-                                        )
+                                          (set! lastrealpath lasttpath))
                                         (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
 
                                         (if (not (null? tal))
                                             (loop (car tal)(cdr tal)))))))
 				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))