Index: trunk/magic/remove/src/streaksio.c
===================================================================
--- trunk/magic/remove/src/streaksio.c	(revision 23910)
+++ trunk/magic/remove/src/streaksio.c	(revision 23911)
@@ -6,4 +6,5 @@
 static void streakFilesFree(streakFiles *sf);
 static void freeImages(streakFiles *);
+static void setExciseValue(sFile *in);
 
 static nebServer *ourNebServer = NULL;
@@ -471,4 +472,5 @@
     sf->inImage->numCols = readout->image->numCols;
     sf->inImage->numRows = readout->image->numRows;
+    setExciseValue(sf->inImage);
 }
 
@@ -545,11 +547,5 @@
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
-        if (in->image->type.type == PS_TYPE_U16) {
-            in->exciseValue = 65535;
-            psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 65535);
-            psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 65535);
-        } else {
-            in->exciseValue = NAN;
-        }
+        setExciseValue(in);
     }  else {
         if (stage != IPP_STAGE_RAW) {
@@ -613,4 +609,6 @@
 
 #ifdef STREAKS_COMPRESS_OUTPUT
+    // Paul says that I should be able to leave this blank
+    bitpix = 0;
     setFitsOptions(out, bitpix, bscale, bzero);
     setFitsOptions(rec, bitpix, bscale, bzero);
@@ -1035,2 +1033,13 @@
     ourNebServer = NULL;
 }
+static void
+setExciseValue(sFile *in)
+{
+    if (in->image->type.type == PS_TYPE_U16) {
+        in->exciseValue = 65535;
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "BLANK", 0, "", 65535);
+        psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 65535);
+    } else {
+        in->exciseValue = NAN;
+    }
+}
Index: trunk/magic/remove/src/streaksremove.c
===================================================================
--- trunk/magic/remove/src/streaksremove.c	(revision 23910)
+++ trunk/magic/remove/src/streaksremove.c	(revision 23911)
@@ -28,5 +28,5 @@
         streaksExit("", PS_EXIT_CONFIG_ERROR);
     }
-    double maskStreak = (double) psMetadataLookupU8(&status, masks, "STREAK");
+    double maskStreak = (double) psMetadataLookupU16(&status, masks, "STREAK");
     if (!status) {
         psError(PM_ERR_CONFIG, false, "failed to lookup mask value for STREAK in recipes\n");
@@ -35,10 +35,10 @@
 
     // optionally setting pixels with any mask bits execpt POOR.WARP to NAN
-    psU8 poorWarp = (double) psMetadataLookupU8(&status, masks, "POOR.WARP");
+    psU16 poorWarp = (double) psMetadataLookupU16(&status, masks, "CONV.POOR");
     if (!status) {
         psError(PM_ERR_CONFIG, false, "failed to lookup mask value for POOR.WARP in recipes\n");
         streaksExit("", PS_EXIT_CONFIG_ERROR);
     }
-    psU8 maskMask = ~poorWarp;
+    psU16 maskMask = ~poorWarp;
 
     psString streaksFileName = psMetadataLookupStr(NULL, config->arguments, "STREAKS");