diff --git a/slsDetectorSoftware/eigerDetectorServer/Beb.c b/slsDetectorSoftware/eigerDetectorServer/Beb.c
index 1174392b6..77408c82f 100644
--- a/slsDetectorSoftware/eigerDetectorServer/Beb.c
+++ b/slsDetectorSoftware/eigerDetectorServer/Beb.c
@@ -568,6 +568,7 @@ int Beb_StopAcquisition()
   *(ptrl+7) = 0;
   *(ptrr+7) = 0;
   close(fd);
+  return 1;
 }
 
 int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_number, unsigned int nimages, int test_just_send_out_packets_no_wait){
@@ -637,9 +638,8 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_nu
   ptrl = (u_int32_t*)(CSP0BASE);
   ptrr = (u_int32_t*)(CSP0BASE+0x100);
 
-  int i;
-
 #ifdef MARTIN
+  int i;
   for (i=0; i < 10; i++)
 	  printf("%X\n",*(ptrl+i));
 #endif
diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile
index effb17e9c..462930bac 100755
--- a/slsDetectorSoftware/eigerDetectorServer/Makefile
+++ b/slsDetectorSoftware/eigerDetectorServer/Makefile
@@ -1,6 +1,6 @@
 CC			=	powerpc-4xx-softfloat-gcc
 CCX			=	powerpc-4xx-softfloat-g++
-CFLAGS		+=  -Wall -DDACS_INT -DMARTIN  -DEIGERD  -DSLS_DETECTOR_FUNCTION_LIST  -DDACS_INT -DSTOP_SERVER  #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN
+CFLAGS		+=  -Wall -DDACS_INT  -DEIGERD  -DSLS_DETECTOR_FUNCTION_LIST  -DDACS_INT -DSTOP_SERVER  #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN
 LDLIBS		+= 	-lm  -lstdc++ 
 
 PROGS		= 	eigerDetectorServer 
diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
index 249c97ce4..c4d92e50a 100755
Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer differ
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index 3415e9f7b..88339bf3f 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -530,6 +530,7 @@ int stopStateMachine(){
 	printf("Going to stop acquisition\n");
 	if(Feb_Control_StopAcquisition() & Beb_StopAcquisition())
 		return OK;
+	printf("failed to stop acquisition\n");
 	return FAIL;
 }
 
@@ -537,7 +538,7 @@ int stopStateMachine(){
 int startReadOut(){
 
 	//RequestImages();
-	int ret_val = 0, i;
+	int ret_val = 0;
 	dst_requested[0] = 1;
 	while(dst_requested[on_dst]){
 		//waits on data
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
index 25971e6d5..9a2bd6f0b 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
@@ -555,7 +555,7 @@ void* postProcessing::processData(int delflag) {
 #endif
 				pthread_mutex_unlock(&mg);
 				//go through once more to get last nth frame data
-				if (acquiringDone >= 2){
+				if (acquiringDone >= 4){
 					if((!nthframe) ||(!newData)){
 #ifdef VERY_VERY_DEBUG
 						cout << "gonna post for it to end" << endl;
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 8cfa80dd0..ad749c248 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -2197,9 +2197,9 @@ int stop_acquisition(int file_des) {
 
 	sprintf(mess,"can't stop acquisition\n");
 
-#ifdef VERBOSE
+//#ifdef VERBOSE
 	printf("Stopping acquisition\n");
-#endif 
+//#endif
 #ifdef SLS_DETECTOR_FUNCTION_LIST
 	if (differentClients==1 && lockStatus==1) {
 		ret=FAIL;