Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -326,14 +326,16 @@
 		 (debug:print-info 0 "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
 	 
 	 ;; keep going unless time to exit
 	 ;;
 	 (if (not *time-to-exit*)
-	     (begin
-	       (thread-sleep! 5) ;; wait five seconds before syncing again, we'll also sync on exit
-	       (loop)))))
-     "Watchdog thread")))
+	     (let delay-loop ((count 0))
+	       (if (and (not *time-to-exit*)
+			(< count 11)) ;; aprox 5-6 seconds
+		   (delay-loop (+ count 1))))
+	     (loop)))))
+   "Watchdog thread"))
 
 (thread-start! *watchdog*)
 
 (if (args:get-arg "-log")
     (let ((oup (open-output-file (args:get-arg "-log"))))
@@ -1080,12 +1082,12 @@
 
 (if (args:get-arg "-step")
     (begin
       (megatest:step 
        (args:get-arg "-step")
-       (args:get-arg ":state")
-       (args:get-arg ":status")
+       (or (args:get-arg "-state")(args:get-arg ":state"))
+       (or (args:get-arg "-status")(args:get-arg ":status"))
        (args:get-arg "-setlog")
        (args:get-arg "-m"))
       ;; (if db (sqlite3:finalize! db))
       (set! *didsomething* #t)))