Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -105,10 +105,14 @@
 	chmod a+x $@
 
 $(PREFIX)/bin/nbfind : utils/nbfind
 	$(INSTALL) $< $@
 	chmod a+x $@
+
+$(PREFIX)/bin/nbload : utils/nbload
+	$(INSTALL) $< $@
+	chmod a+x $@
 
 $(PREFIX)/bin/refdb : refdb
 	$(INSTALL) $< $@
 	chmod a+x $@
 
@@ -126,11 +130,11 @@
 	$(INSTALL) dboard $(PREFIX)/bin/dboard
 	utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 
 install : bin $(PREFIX)/bin/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
-          $(PREFIX)/bin/nbfind $(PREFIX)/bin/newdboard $(PREFIX)/bin/refdb $(PREFIX)/bin/mt_xterm $(PREFIX)/bin/revtagfsl
+          $(PREFIX)/bin/nbfind $(PREFIX)/bin/nbload $(PREFIX)/bin/newdboard $(PREFIX)/bin/refdb $(PREFIX)/bin/mt_xterm $(PREFIX)/bin/revtagfsl
 
 deploytarg/apropos.so : Makefile
 	for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \
 	chicken-install -prefix deploytarg -deploy $$i;done
 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -346,11 +346,11 @@
 	"unknown"
 	(caar uname-res))))
 	      
 (define (save-environment-as-files fname #!key (ignorevars (list "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR")))
   (let ((envvars (get-environment-variables))
-        (whitesp (regexp "[^a-zA-Z0-9_\\-:;,.\\/%$]")))
+        (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (key)
 		      (if (not (member key ignorevars))
 			  (let* ((val (cdr key))

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -76,12 +76,18 @@
 	      lbl)
 	    (store-label "testcomment"
 			 (iup:label "TestComment                             "
 				    #:expand "HORIZONTAL")
 			 (lambda (testdat)
-			   ;; (sdb:qry 'getstr 
-			   (db:test-get-comment testdat))) ;; )
+			   (let ((newcomment (db:test-get-comment testdat)))
+			     (if *dashboard-comment-share-slot*
+				 (if (not (equal? (iup:attribute *dashboard-comment-share-slot* "VALUE")
+						  newcomment))
+				     (iup:attribute-set! *dashboard-comment-slot*
+							 "VALUE"
+							 newcomment)))
+			     newcomment)))
 	    (store-label "testid"
 			 (iup:label "TestId                             "
 				    #:expand "HORIZONTAL")
 			 (lambda (testdat)
 			   (db:test-get-id testdat)))
@@ -216,28 +222,34 @@
 	 (color  (car (gutils:get-color-for-state-status state status))))
     ((vector-ref *state-status* 0) state color)
     ((vector-ref *state-status* 1) status color)))
 
 (define *dashboard-test-db* #t)
+(define *dashboard-comment-share-slot* #f)
 
 ;;======================================================================
 ;; Set fields 
 ;;======================================================================
 (define (set-fields-panel dbstruct run-id test-id testdat #!key (db #f))
   (let ((newcomment #f)
 	(newstatus  #f)
-	(newstate   #f))
+	(newstate   #f)
+	(wtxtbox    #f))
     (iup:frame
      #:title "Set fields"
      (iup:vbox
       (iup:hbox (iup:label "Comment:")
-		(iup:textbox #:action (lambda (val a b)
+		(let ((txtbox (iup:textbox #:action (lambda (val a b)
 					(rmt:test-set-state-status-by-id run-id test-id #f #f b)
-					;; IDEA: Just set a variable with the proc to call?
-					(set! newcomment b))
-			     #:value (db:test-get-comment testdat)
-			     #:expand "HORIZONTAL"))
+						      ;; IDEA: Just set a variable with the proc to call?
+						      (open-run-close db:test-set-state-status-by-id db test-id #f #f b)
+						      (set! newcomment b))
+					   #:value (db:test-get-comment testdat)
+					   #:expand "HORIZONTAL")))
+		  (set! wtxtbox txtbox)
+		  txtbox))
+		  
       (apply iup:hbox
 	     (iup:label "STATE:" #:size "30x")
 	     (let* ((btns  (map (lambda (state)
 				  (let ((btn (iup:button state
 							 #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10"
@@ -262,12 +274,20 @@
 				  (let ((btn (iup:button status
 							 #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10"
 							 #:action (lambda (x)
 								    (let ((t (iup:attribute x "TITLE")))
 								      (if (equal? t "WAIVED")
-									  (iup:show (dashboard-tests:waiver testdat (lambda (c)
-														      (set! newcomment c))))
+									  (iup:show (dashboard-tests:waiver testdat 
+													    (if wtxtbox (iup:attribute wtxtbox "VALUE") #f)
+													    (lambda (c)
+													      (set! newcomment c)
+													      (if wtxtbox 
+														  (begin
+														    (iup:attribute-set! wtxtbox "VALUE" c)
+														    (if (not *dashboard-comment-share-slot*)
+															(set! *dashboard-comment-share-slot* wtxtbox)))
+														  ))))
 									  (begin
 									    (open-run-close db:test-set-state-status-by-id db test-id #f status #f)
 									    (db:test-set-status! testdat status))))))))
 				    btn))
 				(map cadr *common:std-statuses*)))) ;; (list  "PASS" "WARN" "FAIL" "CHECK" "n/a" "WAIVED" "SKIP"))))
@@ -314,21 +334,21 @@
     ;;     	#:expand "HORIZONTAL"
     ;;     	#:action (lambda (obj)
     ;;     		   (print "Refresh test data " stepname))
     )))
 
-(define (dashboard-tests:waiver testdat cmtcmd)
+(define (dashboard-tests:waiver testdat ovrdval cmtcmd)
   (let* ((wpatt (configf:lookup *configdat* "setup" "waivercommentpatt"))
 	 (wregx (if (string? wpatt)(regexp wpatt) #f))
 	 (wmesg (iup:label (if wpatt (conc "Comment must match pattern " wpatt) "")))
 	 (comnt (iup:textbox #:action (lambda (val a b)
 					(if wpatt
 					    (if (string-match wregx b)
 						(iup:attribute-set! wmesg "TITLE" (conc "Comment matches " wpatt))
 						(iup:attribute-set! wmesg "TITLE" (conc "Comment does not match " wpatt))
 						)))
-			     #:value (db:test-get-comment testdat)
+			     #:value (if ovrdval ovrdval (db:test-get-comment testdat))
 			     #:expand "HORIZONTAL"))
 	 (dlog  #f))
     (set! dlog (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES"
 		#:title "SET WAIVER"
 		(iup:vbox ; #:expand "YES"

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -998,11 +998,11 @@
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
 			  ;; (cdb:test-set-log! *runremote* test-id (sdb:qry 'getid htmllogfile))))
-			  (rmt:test-set-log! test-id htmllogfile)))
+			  (rmt:test-set-log! run-id test-id htmllogfile)))
 		    (let ((msg (args:get-arg "-m")))
 		      (rmt:teststep-set-status! run-id test-id stepname "end" exitstat msg logfile))
 		    )))
 	  (if (or (args:get-arg "-test-status")
 		  (args:get-arg "-set-values"))

Index: tests/fullrun/tests/test_mt_vars/currentisblah.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/currentisblah.sh
+++ tests/fullrun/tests/test_mt_vars/currentisblah.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-grep -e '^CURRENT' megatest.sh | grep /tmp/nada
+grep -e '^export CURRENT' megatest.sh | grep /tmp/nada

Index: utils/installall.sh
==================================================================
--- utils/installall.sh
+++ utils/installall.sh
@@ -302,10 +302,16 @@
 # disabled zmq #     # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -deploy -prefix $DEPLOYTARG zmq
 # disabled zmq # fi
 # disabled zmq # fi # if zmq is in /usr/lib
 # disabled zmq # 
 cd $BUILDHOME  
+
+git clone https://bitbucket.org/DerGuteMoritz/zmq/commits/branch/3.2 zmq-3.2
+cd zmq-3.2
+chicken-install
+
+cd $BUILDHOME
 
 ## WEBKIT=WebKit-r131972
 ## if  ! [[ -e ${WEBKIT}.tar.bz2 ]] ; then
 ##    #    http://builds.nightly.webkit.org/files/trunk/src/WebKit-r131972.tar.bz2
 ##    wget http://builds.nightly.webkit.org/files/trunk/src/${WEBKIT}.tar.bz2

Index: utils/mtgetfile
==================================================================
--- utils/mtgetfile
+++ utils/mtgetfile
@@ -18,11 +18,11 @@
 		  ((not key-vals) "missing -target")
 		  ((not target)   "missing -target")
 		  ((not scriptn)  "missing file name to find")
 		  (else #f))))
   (if errmsg
-      (begin
+      (begin 
 	(print "THEPATH: Missing required switch: " errmsg)
 	(print "THEPATH: Usage: mtgetfile -target target scriptname [searchpath]")
 	(exit)))
   (print "THEPATH: key-vals=" key-vals " path=" path " scriptn=" scriptn))
 EOF

Index: utils/nbload
==================================================================
--- utils/nbload
+++ utils/nbload
@@ -2,23 +2,28 @@
 
 # load=`uptime|awk '{print $10}'|cut -d, -f1`
 load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'`
 if which cpucheck > /dev/null;then
     numcpu=`cpucheck|tail -1|awk '{print $6}'`
-else
+elif which lscpu > /dev/null;then
     numcpu=`lscpu|grep "CPU.s.:"|awk '{print $2}'`
+else
+    numcpu=2
 fi
 
+# NB// max_load is in units of percent.
+#
 lperc=`echo "100 * $load / $numcpu"|bc`
 if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then
-  max_load=50
+  max_load=100
 else
   max_load=$MAX_ALLOWED_LOAD
-fi 
-if [[ $lperc -lt $max_load ]];then
-  echo "$@" | at now + 0 minutes
-elif [[ "x$NBLAUNCHER" == "x" ]];then
-  echo "nbfind $@" | at now + 2 minutes
-else
-  $NBLAUNCHER "$@"
 fi
 
+if [[  $lperc -lt $max_load ]];then
+  echo "Load acceptable: lperc=$lperc %, max_load=$max_load %, load=$load, numcpu=$numcpu, MAX_ALLOWED_LOAD=$MAX_ALLOWED_LOAD %"
+  echo "Starting command: \"$@\""
+  nbfake "$@"
+else
+  # echo "Load too high: lperc=$lperc, max_load=$max_load, waiting two minutes before trying to run command: \"$@\""
+  echo "nbload $@" | at now + 2 minutes 2> /dev/null
+fi