@@ -39,14 +39,16 @@
   :state                  : required if updating step state; e.g. start, end, completed
   :status                 : required if updating step status; e.g. pass, fail, n/a
 
 Values and record errors and warnings
   -set-values             : update or set values in the megatest db 
-  :value                  : value measured
-  :expected_value         : value expected
-  :tol                    : |value-expect| <= tol
-  :units                  : name of the units for value, expected_value and tol
+  :category               : set the category field (optional)
+  :variable               : set the variable name (optional)
+  :value                  : value measured (required)
+  :expected               : value expected (required)
+  :tol                    : |value-expect| <= tol (required, can be <, >, >=, <= or number)
+  :units                  : name of the units for value, expected_value etc. (optional)
   :first_err              : record an error message
   :first_warn             : record a warning message
 
 Arbitrary test data loading
   -load-test-data         : read test specific data for storage in the test_data table
@@ -111,14 +113,16 @@
 			"-rerun"
 			"-days"
 			"-rename-run"
 			"-to"
 			;; values and messages
+			":category"
+			":variable"
 			":first_err"
 			":first_warn"
 			":value"
-			":expected_value"
+			":expected"
 			":tol"
 			":units"
 			;; misc
 			"-extract-ods"
 			"-debug" ;; for *verbosity* > 2
@@ -649,11 +653,11 @@
 		    ;; could use an assoc list I guess. 
 		    (otherdata (let ((res (make-hash-table)))
 				 (for-each (lambda (key)
 					     (if (args:get-arg key)
 						 (hash-table-set! res key (args:get-arg key))))
-					   (list ":value" ":tol" ":expected_value" ":first_err" ":first_warn" ":units"))
+					   (list ":value" ":tol" ":expected" ":first_err" ":first_warn" ":units" ":category" ":variable"))
 				 res)))
 		(if (and (args:get-arg "-test-status")
 			 (or (not state)
 			     (not status)))
 		    (begin