diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c
index 324c90bb9..a07d6b2fb 100644
--- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c
+++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c
@@ -1367,7 +1367,7 @@ unsigned int Feb_Control_GetNExposures(){return Feb_Control_nimages;}
 
 int Feb_Control_SetExposureTime(double the_exposure_time_in_sec){
 	Feb_Control_exposure_time_in_sec = the_exposure_time_in_sec;
-	printf("Exposure time set to: %f\n",Feb_Control_exposure_time_in_sec);
+	printf("Exposure time set to: %fs\n",Feb_Control_exposure_time_in_sec);
 	return 1;
 }
 double Feb_Control_GetExposureTime(){return Feb_Control_exposure_time_in_sec;}
diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.1
similarity index 99%
rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.0
rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.1
index b9b7cebb8..2c36d689b 100755
Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.1 differ
diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
index 798a39f65..9533efa17 100644
--- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
@@ -896,7 +896,8 @@ int64_t setTimer(enum timerIndex ind, int64_t val){
 		if(val >= 0){
 			printf(" Setting acq period: %fs\n",val/(1E9));
 			Feb_Control_SetExposurePeriod(val/(1E9));
-		}return (Feb_Control_GetExposurePeriod()*(1E9));
+		}
+		return (Feb_Control_GetExposurePeriod()*(1E9));
 		/*	case DELAY_AFTER_TRIGGER:
 		if(val >= 0)
 			EigerSetNumberOfExposures((unsigned int)val);
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 74ca07186..50cd1c9a4 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -1636,8 +1636,8 @@ int multiSlsDetector::startAndReadAllNoWait(){
 	}
 
 	return ret1;
-
-	/* hanging randomly around 4000-5000 frames at 1sec exptime (threads dont return)
+/*
+	// hanging randomly around 4000-5000 frames at 1sec exptime (threads dont return)
 	int i=0;
 	int ret=OK;
 	int posmin=0, posmax=thisMultiDetector->numberOfDetectors;
@@ -1683,7 +1683,7 @@ int multiSlsDetector::startAndReadAllNoWait(){
 	}
 
 	return ret;
-	 */
+*/
 }
 
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 7c2978407..4f396e5a6 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -4017,10 +4017,11 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
 	//send acquisiton period/frame number to receiver
 	if((index==FRAME_NUMBER)||(index==FRAME_PERIOD)||(index==CYCLES_NUMBER)){
 		if(ret != FAIL){
+			retval = thisDetector->timerValue[index];
 			if(setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG){
 				int64_t args[2];
 				args[1] = retval;
-				if(t == -1)  args[1] = -1;
+				if((t == -1) && (ret!= FORCE_UPDATE)) args[1] = -1;
 
 				if((index==FRAME_NUMBER)||(index==CYCLES_NUMBER)){
 #ifdef VERBOSE
@@ -4047,11 +4048,11 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t){
 					if(index==FRAME_PERIOD){
 						//exptime sent if acq period = 0
 						if(retval){
-							cout << "ERROR:Acquisition Period in receiver set incorrectly to " << ut << " instead of " << retval << endl;
+							cout << "ERROR:Acquisition Period in receiver set incorrectly to " << ut << " instead of " << thisDetector->timerValue[index] << endl;
 							setErrorMask((getErrorMask())|(RECEIVER_ACQ_PERIOD_NOT_SET));
 						}
 					}else{
-						cout << "ERROR:Number of Frames (* Number of cycles) in receiver set incorrectly to " << ut << " instead of " << retval << endl;
+						cout << "ERROR:Number of Frames (* Number of cycles) in receiver set incorrectly to " << ut << " instead of " << thisDetector->timerValue[index] << endl;
 						setErrorMask((getErrorMask())|(RECEIVER_FRAME_NUM_NOT_SET));
 					}
 				}
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
index b803a7a9f..a0aec440e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
@@ -3964,7 +3964,6 @@ string slsDetectorCommand::cmdTimer(int narg, char *args[], int action) {
   if (index==ACQUISITION_TIME || index==SUBFRAME_ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER)
     rval=(double)ret*1E-9;
   else rval=ret;
-  
 
   //set frame index
   if (index==FRAME_NUMBER || index==CYCLES_NUMBER ){