diff --git a/el737hpdriv.c b/el737hpdriv.c
index b0da275..8d26b33 100644
--- a/el737hpdriv.c
+++ b/el737hpdriv.c
@@ -544,6 +544,9 @@ static int EL737Set(struct __COUNTER *self, char *name, int iCter,
       return 0;
     }
     return 1;
+  } else if(strcmp(name,"debug") == 0){
+    setRS232Debug(pPriv->controller,(int)fVal);
+    return 1;
   } else {
     self->iErrorCode = UNKNOWNPAR;
     return 0;
@@ -567,6 +570,9 @@ static int EL737Get(struct __COUNTER *self, char *name, int iCter,
     }
     sscanf(pReply,"%f", fVal);
     return 1;
+  } else if(strcmp(name,"debug") == 0){
+    *fVal = pPriv->controller->debug;
+    return 1;
   } else {
     self->iErrorCode = UNKNOWNPAR;
     return 0;
diff --git a/fowrite.c b/fowrite.c
index 1a8b352..13a00c4 100644
--- a/fowrite.c
+++ b/fowrite.c
@@ -749,25 +749,15 @@
               fAxis[i] = (float)i;
           }
           iStat = CalculateFitFromData(self->pFitter,fAxis,lSum,iTime);
-          if(iStat != 1)
-	  {
-              SCWrite(pCon,"WARNING: problem locating elastic peak",eWarning);
-          }
           GetFitResults(self->pFitter,&fCenter,&fStdDev,&fFWHM,&fVal);
           fVal = fCenter - self->fElastic;
           if(fVal < 0.)
               fVal = - fVal;
            /* bad value, leave at theoretical value */
-           if(fVal > 10.)
-	   {
-               SCWrite(pCon,
-           "WARNING: bad fit result, using theoretical elastic peak position",
-                eWarning);
-            }
-            else
-	    {
+           if(fVal < 10.)
+           {
               self->fElastic = fCenter;
-            }
+           }
             free(lSum);
             free(fAxis);
          }