Index: branches/cnb_branch_20080830/ippTools/src/camtoolConfig.c
===================================================================
--- branches/cnb_branch_20080829/ippTools/src/camtoolConfig.c	(revision 19291)
+++ branches/cnb_branch_20080830/ippTools/src/camtoolConfig.c	(revision 19300)
@@ -71,6 +71,6 @@
 
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",               0, "allow everything to be queued without search terms", false);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state",              0, "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label",              0, "set label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state",              0, "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label",              0, "set label", NULL);
     // XXX change the two above to use -set-state and -set-label?
 
Index: branches/cnb_branch_20080830/ippTools/src/pxcam.c
===================================================================
--- branches/cnb_branch_20080829/ippTools/src/pxcam.c	(revision 19291)
+++ branches/cnb_branch_20080830/ippTools/src/pxcam.c	(revision 19300)
@@ -41,4 +41,5 @@
     psMetadataAddStr(md,  PS_LIST_TAIL, "-exp_type",           0, "search by exp_type", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-label",              0, "search by label", NULL);
+    psMetadataAddStr(md,  PS_LIST_TAIL, "-comment",            0, "search by comment", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-filelevel",          0, "search by filelevel", NULL);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-reduction",          0, "search by reduction class", NULL);
@@ -87,4 +88,5 @@
     PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
+    PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "==");
Index: branches/cnb_branch_20080830/ippTools/src/warptool.c
===================================================================
--- branches/cnb_branch_20080829/ippTools/src/warptool.c	(revision 19291)
+++ branches/cnb_branch_20080830/ippTools/src/warptool.c	(revision 19300)
@@ -1151,4 +1151,5 @@
 
     PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "warpRun.label", "==");
     PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "==");
     PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "==");
Index: branches/cnb_branch_20080830/ippTools/src/warptoolConfig.c
===================================================================
--- branches/cnb_branch_20080829/ippTools/src/warptoolConfig.c	(revision 19291)
+++ branches/cnb_branch_20080830/ippTools/src/warptoolConfig.c	(revision 19300)
@@ -258,4 +258,5 @@
     psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
+    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-label",  0,            "search by label", NULL);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);