diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
index aa44dc176..f431e5160 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
@@ -2,10 +2,10 @@
 #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
 //#define SVNREPPATH ""
 #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
-//#define SVNREV 0x416
+//#define SVNREV 0x417
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "l_maliakal_d"
-#define SVNREV 0x416
-#define SVNDATE 0x20121218
+#define SVNREV 0x417
+#define SVNDATE 0x20121220
 //
diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
index 8d5d11b6d..f55c464ca 100644
--- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
+++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
@@ -2,10 +2,10 @@
 #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
 //#define SVNREPPATH ""
 #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
-//#define SVNREV 0x414
+//#define SVNREV 0x417
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "l_maliakal_d"
-#define SVNREV 0x414
-#define SVNDATE 0x20121218
+#define SVNREV 0x417
+#define SVNDATE 0x20121220
 //
diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h
index e3884089f..864771371 100644
--- a/slsDetectorSoftware/slsDetector/svnInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h
@@ -2,10 +2,10 @@
 #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
 //#define SVNREPPATH ""
 #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
-//#define SVNREV 0x416
+//#define SVNREV 0x417
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTHLIB "l_maliakal_d"
-#define SVNREVLIB 0x416
-#define SVNDATELIB 0x20121218
+#define SVNREVLIB 0x417
+#define SVNDATELIB 0x20121220
 //
diff --git a/slsDetectorSoftware/slsReceiver/circularFifo.h b/slsDetectorSoftware/slsReceiver/circularFifo.h
index 325ea6030..9f834dc02 100644
--- a/slsDetectorSoftware/slsReceiver/circularFifo.h
+++ b/slsDetectorSoftware/slsReceiver/circularFifo.h
@@ -15,6 +15,8 @@
 #ifndef CIRCULARFIFO_H_
 #define CIRCULARFIFO_H_
 
+#include "sls_detector_defs.h"
+
 /** Circular Fifo (a.k.a. Circular Buffer) 
 * Thread safe for one reader, and one writer */
 template<typename Element, unsigned int Size>
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
index 37b67da66..ae6e16399 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver.cpp
@@ -4,7 +4,7 @@
 #include "receiver_defs.h"
 #include "MySocketTCP.h"
 #include "slsReceiver_funcs.h"
-
+#include "sls_detector_defs.h"
 
 #include <signal.h>	//SIGINT
 #include <cstdlib>	//EXIT
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
index 0dc6dd754..368b24329 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
@@ -257,6 +257,7 @@ int slsReceiverFunctionList::startListening(){
 				//cout<<"startFrameIndex:"<<startFrameIndex<<endl;
 				prevframenum=startFrameIndex;
 			}
+
 			//start of acquisition
 			if(startAcquisitionIndex==-1){
 				startAcquisitionIndex=startFrameIndex;
diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
index 698187ac5..5b6d5b3e9 100644
--- a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
+++ b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
@@ -695,15 +695,15 @@ int	slsReceiverFuncs::read_frame(){
 			if((index%2)!=index2%2){
 				//ideal situation (should be odd, even(index+1))
 				if(index%2){
-					memcpy(retval,((char*) origVal)+2, onedatasize);
-					memcpy((((char*)retval)+onedatasize), ((char*) origVal)+8+onedatasize, onedatasize);
+					memcpy(retval,((char*) origVal)+4, onedatasize);
+					memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
 					break;
 				}
 
 				//swap to even,odd
 				if(index2%2){
-					memcpy((((char*)retval)+onedatasize),((char*) origVal)+2, onedatasize);
-					memcpy(retval, ((char*) origVal)+8+onedatasize, onedatasize);
+					memcpy((((char*)retval)+onedatasize),((char*) origVal)+4, onedatasize);
+					memcpy(retval, ((char*) origVal)+10+onedatasize, onedatasize);
 					index=index2;
 					break;
 				}
@@ -717,13 +717,12 @@ int	slsReceiverFuncs::read_frame(){
 		if(count==20){
 			cout << "same type: index:" << index << "\tindex2:" << index2 << endl;
 			/**send garbage with -1 index to try again*/
-			memcpy(retval,((char*) origVal)+2, onedatasize);
-			memcpy((((char*)retval)+onedatasize), ((char*) origVal)+8+onedatasize, onedatasize);
+			memcpy(retval,((char*) origVal)+4, onedatasize);
+			memcpy((((char*)retval)+onedatasize), ((char*) origVal)+10+onedatasize, onedatasize);
 		}
 
 		arg=((index - startIndex)/2)-1;
 
-
 #ifdef VERBOSE
 		cout << "\nstartIndex:" << startIndex << endl;
 		cout << "fName:" << fName << endl;
diff --git a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
index 477866e53..ef95c91c7 100644
--- a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
+++ b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
@@ -2,10 +2,10 @@
 #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
 //#define SVNREPPATH ""
 #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
-//#define SVNREV 0x415
+//#define SVNREV 0x417
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "l_maliakal_d"
-#define SVNREV 0x415
-#define SVNDATE 0x20121218
+#define SVNREV 0x417
+#define SVNDATE 0x20121220
 //