Index: trunk/psastro/src/Makefile.am
===================================================================
--- trunk/psastro/src/Makefile.am	(revision 41659)
+++ trunk/psastro/src/Makefile.am	(revision 41705)
@@ -109,5 +109,4 @@
 	psastroMosaicSetMatch.c     \
 	psastroFindChip.c           \
-	psastroFindChipGPC.c           \
 	psastroZeroPoint.c    	    \
 	psastroDemoDump.c           \
Index: trunk/psastro/src/psastro.h
===================================================================
--- trunk/psastro/src/psastro.h	(revision 41659)
+++ trunk/psastro/src/psastro.h	(revision 41705)
@@ -184,9 +184,4 @@
 bool 		  psastroFPAtoChip (double *xChip, double *yChip, pmFPA *fpa, int nChip, double xFPA, double yFPA);
 
-pmChip           *psastroFindChipGPC (double *xChip, double *yChip, pmFPA *fpa, double xFPA, double yFPA);
-bool 		  psastroChipBoundsGPC (pmFPA *fpa);
-pmChip           *psastroCheckChip (double *xChip, double *yChip, pmFPA *fpa, int nChip, double xFPA, double yFPA);
-bool              psastroExtractFreeChipBoundsGPC(void);
-
 //bool              psastroMaskStats(pmConfig *config, psMetadata *stats);
 
Index: trunk/psastro/src/psastroLoadGlints.c
===================================================================
--- trunk/psastro/src/psastroLoadGlints.c	(revision 41659)
+++ trunk/psastro/src/psastroLoadGlints.c	(revision 41705)
@@ -133,8 +133,8 @@
 
 	    // select stars that land in this region
-	    if (star->FP->x < glintRegion.x0) continue;
-	    if (star->FP->x > glintRegion.x1) continue;
-	    if (star->FP->y < glintRegion.y0) continue;
-	    if (star->FP->y > glintRegion.y1) continue;
+	    if (star->FP->x < glintRegion.x0) {continue;}
+	    if (star->FP->x > glintRegion.x1) {continue;}
+	    if (star->FP->y < glintRegion.y0) {continue;}
+	    if (star->FP->y > glintRegion.y1) {continue;}
 
 	    char *glintType = psMetadataLookupStr (&status, glintItem->data.md, "GLINT.TYPE");
@@ -147,5 +147,5 @@
             //glint length should depend on the brightness on image, i.e. in instrumental mag. The same instrumental mag in different filters should likely give the same glint length.
 	    double glintLength = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO - (star->Mag-MagOffset));
-            double glintAngle = 0;
+            double glintAngle = 0.;
 
             //Besides brightness, the length of the glints also depends on the position of the star compared to the focal plane. But, seemingly only for stars closer than about 30k pixels
@@ -167,8 +167,8 @@
 
             //do a rudimentary check of whether the glint enters the pixel FPA
-            if (!strcasecmp(glintType, "TOP")    && ((star->FP->y - glintLength) > 20000.))  continue;
-            if (!strcasecmp(glintType, "BOTTOM") && ((star->FP->y + glintLength) < -20000.))  continue;
-            if (!strcasecmp(glintType, "LEFT")   && ((star->FP->x + glintLength) < -20000.))  continue;
-            if (!strcasecmp(glintType, "RIGHT")  && ((star->FP->x - glintLength) > 20000.))  continue;
+            if (!strcasecmp(glintType, "TOP")    && ((star->FP->y - glintLength) > 20000.))  {continue;}
+            if (!strcasecmp(glintType, "BOTTOM") && ((star->FP->y + glintLength) < -20000.))  {continue;}
+            if (!strcasecmp(glintType, "LEFT")   && ((star->FP->x + glintLength) < -20000.))  {continue;}
+            if (!strcasecmp(glintType, "RIGHT")  && ((star->FP->x - glintLength) > 20000.))  {continue;}
 
 	    if (!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM")) {
@@ -183,5 +183,5 @@
 		    for (int nChip = 0; nChip < fpa->chips->n; nChip++) {
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInXrange (fpa, nChip, star->FP->x, 20000.)) {
@@ -209,5 +209,5 @@
 		    for (int nChip = 0; nChip < fpa->chips->n; nChip++) {
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInXrange (fpa, nChip, star->FP->x, -20000.)) {
@@ -232,5 +232,5 @@
 		}
 
-                if(glintLength < GLINT_LENGTH_MIN_FPA) continue;
+                if(glintLength < GLINT_LENGTH_MIN_FPA) {continue;}
 
 	        x_glint->data.F32[0] = xFPA0;
@@ -245,5 +245,5 @@
 
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInXrange (fpa, nChip, x_glint->data.F32[glint_point], y_glint->data.F32[glint_point])) {
@@ -262,6 +262,6 @@
 
 		        // does this glint cross this chip?
-		        if (yFPA0 > yFPAe) continue;
-		        if (yFPA1 < yFPAs) continue;
+		        if (yFPA0 > yFPAe) {continue;}
+		        if (yFPA1 < yFPAs) {continue;}
 
 
@@ -287,12 +287,12 @@
 
 		   	// select the 0th readout of the 0th cell for this chip
-		   	if (!chip->cells) continue;
-		   	if (!chip->cells->n) continue;
+		   	if (!chip->cells) {continue;}
+		   	if (!chip->cells->n) {continue;}
 		   	pmCell *glintCell = chip->cells->data[0];
-		   	if (!glintCell) continue;
-		   	if (!glintCell->readouts) continue;
-		   	if (!glintCell->readouts->n) continue;
+		   	if (!glintCell) {continue;}
+		   	if (!glintCell->readouts) {continue;}
+		   	if (!glintCell->readouts->n) {continue;}
 		   	pmReadout *glintReadout = glintCell->readouts->data[0];
-		   	if (!glintReadout) continue;
+		   	if (!glintReadout) {continue;}
 		   	
 		   	// save the glints on the readout->analysis metadata, creating if needed
@@ -332,5 +332,5 @@
 		    for (int nChip = 0; nChip < fpa->chips->n; nChip++) {
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInXrange (fpa, nChip, 20000.,star->FP->y)) {
@@ -358,5 +358,5 @@
 		    for (int nChip = 0; nChip < fpa->chips->n; nChip++) {
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInXrange (fpa, nChip, -20000.,star->FP->y)) {
@@ -381,5 +381,5 @@
 		}
 
-                if(glintLength < GLINT_LENGTH_MIN_FPA) continue;
+                if(glintLength < GLINT_LENGTH_MIN_FPA) {continue;}
 
 	        x_glint->data.F32[0] = xFPA0;
@@ -393,5 +393,5 @@
 
  			pmChip *chip = fpa->chips->data[nChip];
- 			if (!chip) continue;
+ 			if (!chip) {continue;}
 
 		   	if (!psastroFindChipInYrange (fpa, nChip, x_glint->data.F32[glint_point], y_glint->data.F32[glint_point])) {
@@ -410,6 +410,6 @@
 
 		        // does this glint cross this chip?
-		        if (xFPA0 > xFPAe) continue;
-		        if (xFPA1 < xFPAs) continue;
+		        if (xFPA0 > xFPAe) {continue;}
+		        if (xFPA1 < xFPAs) {continue;}
 
                         //find the x-coord positions for this chip
@@ -433,12 +433,12 @@
 
 		   	// select the 0th readout of the 0th cell for this chip
-		   	if (!chip->cells) continue;
-		   	if (!chip->cells->n) continue;
+		   	if (!chip->cells) {continue;}
+		   	if (!chip->cells->n) {continue;}
 		   	pmCell *glintCell = chip->cells->data[0];
-		   	if (!glintCell) continue;
-		   	if (!glintCell->readouts) continue;
-		   	if (!glintCell->readouts->n) continue;
+		   	if (!glintCell) {continue;}
+		   	if (!glintCell->readouts) {continue;}
+		   	if (!glintCell->readouts->n) {continue;}
 		   	pmReadout *glintReadout = glintCell->readouts->data[0];
-		   	if (!glintReadout) continue;
+		   	if (!glintReadout) {continue;}
 		   	
 		   	// save the glints on the readout->analysis metadata, creating if needed
Index: trunk/psastro/src/psastroMaskUpdates.c
===================================================================
--- trunk/psastro/src/psastroMaskUpdates.c	(revision 41659)
+++ trunk/psastro/src/psastroMaskUpdates.c	(revision 41705)
@@ -91,5 +91,5 @@
     psImageMaskType spikeMaskValue = pmConfigMaskGet("SPIKE", config); // Mask value for ghost pixels
     psImageMaskType starMaskValue  = pmConfigMaskGet("STARCORE", config); // Mask value for ghost pixels
-    psImageMaskType crosstalkMaskValue = pmConfigMaskGet("GHOST", config); // Mask value for crosstalk ghosts
+    psImageMaskType crosstalkMaskValue = pmConfigMaskGet("CROSSTALK", config); // Mask value for crosstalk ghosts
 
     // psImageMaskType maskBlank  = pmConfigMaskGet("BLANK", config); // Mask value for blank pixels
@@ -331,5 +331,5 @@
 		    psTrace("psastro.masks",4,"In refstar loop: %d/%ld %f %f\n",
 			    i,refstars->n,ref->Mag,REFSTAR_MASK_MAX_MAG);
-                    if (ref->Mag > REFSTAR_MASK_MAX_MAG) continue;
+                    if (ref->Mag > REFSTAR_MASK_MAX_MAG) {continue;}