Index: trunk/psastro/src/psastro.c
===================================================================
--- trunk/psastro/src/psastro.c	(revision 10830)
+++ trunk/psastro/src/psastro.c	(revision 10833)
@@ -53,11 +53,11 @@
     }
 
-    char *mosastro = psMetadataLookupStr (NULL, config->arguments, "MOSASTRO");
-    if (mosastro == NULL) {
-        if (!psastroChipAstrom (config, refs)) {
-	    psErrorStackPrint(stderr, "failed to perform single chip astrometry\n");
-	    exit (1);
-	}
-    } else {
+    if (!psastroChipAstrom (config, refs)) {
+      psErrorStackPrint(stderr, "failed to perform single chip astrometry\n");
+      exit (1);
+    }
+
+    bool mosastro = psMetadataLookupBool (NULL, config->arguments, "MOSAIC.MODE");
+    if (!mosastro) {
 	if (!psastroMosaicAstrom (config, refs)) {
 	    psErrorStackPrint(stderr, "failed to perform mosaic camera astrometry\n");
Index: trunk/psastro/src/psastroArguments.c
===================================================================
--- trunk/psastro/src/psastroArguments.c	(revision 10830)
+++ trunk/psastro/src/psastroArguments.c	(revision 10833)
@@ -12,7 +12,4 @@
     }
 
-    // basic pslib options
-    psLogSetFormat ("M");
-
     // load config data from default locations
     pmConfig *config = pmConfigRead(&argc, argv, PSASTRO_RECIPE);
@@ -23,5 +20,5 @@
 
     // save the following additional recipe values based on command-line options
-    // these options override the PSPHOT recipe values loaded from recipe files
+    // these options override the PSASTRO recipe values loaded from recipe files
     psMetadata *options = pmConfigRecipeOptions (config, PSASTRO_RECIPE);
 
@@ -43,5 +40,5 @@
     if ((N = psArgumentGet (argc, argv, "-mosastro"))) {
         psArgumentRemove (N, &argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSASTRO", PS_DATA_STRING, "", psStringCopy(argv[N]));
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSAIC.MODE", PS_DATA_BOOL, "", psStringCopy(argv[N]));
         psArgumentRemove (N, &argc, argv);
     }