diff --git a/slsDetectorServers/ctbDetectorServer/Makefile b/slsDetectorServers/ctbDetectorServer/Makefile
index c9a810d32..099b148f6 100755
--- a/slsDetectorServers/ctbDetectorServer/Makefile
+++ b/slsDetectorServers/ctbDetectorServer/Makefile
@@ -1,6 +1,6 @@
 CROSS  		= bfin-uclinux-
 CC    		= $(CROSS)gcc
-CFLAGS		+=  -Wall -DCHIPTESTBOARDD  -DSTOP_SERVER -DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE
+CFLAGS		+=  -Wall -DCHIPTESTBOARDD  -DSTOP_SERVER #-DDEBUG1 #-DJCTB -DVERBOSEI #-DVERBOSE
 LDLIBS		+= 	-lm  -lstdc++ 
 
 PROGS		= 	ctbDetectorServer 
@@ -28,4 +28,4 @@ clean:
 	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb
 	
 
-	
\ No newline at end of file
+	
diff --git a/slsDetectorServers/ctbDetectorServer/gitInfo.txt b/slsDetectorServers/ctbDetectorServer/gitInfo.txt
index 9bad94956..13a20eab9 100644
--- a/slsDetectorServers/ctbDetectorServer/gitInfo.txt
+++ b/slsDetectorServers/ctbDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: c93f88b7e5afe231ec43c47d60278c6acdb520af 
-Revision: 19 
-Branch: refactor 
+Repsitory UUID: a4f1b7670f7a6e5bfae9f34f561350643eab6ca5 
+Revision: 23 
+Branch: ctbBugFixes 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4333 
-Last Changed Date: 2019-02-20 08:12:50.000000002 +0100 ./RegisterDefs.h
+Last Changed Rev: 4340 
+Last Changed Date: 2019-02-21 11:22:00.000000002 +0100 ./Makefile
diff --git a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
index d8a4de296..01768d0b3 100644
--- a/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
+++ b/slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "c93f88b7e5afe231ec43c47d60278c6acdb520af"
+#define GITREPUUID "a4f1b7670f7a6e5bfae9f34f561350643eab6ca5"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4333
-#define GITDATE 0x20190220
-#define GITBRANCH "refactor"
+#define GITREV 0x4340
+#define GITDATE 0x20190221
+#define GITBRANCH "ctbBugFixes"
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
index 9d0639af9..4bd9e1233 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]){
 				FILE_LOG(logINFO, ("Detected phase shift of %d\n", phaseShift));
 			}
 #endif
-#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD)
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
 			else if(!strcasecmp(argv[i],"-update")){
 				FILE_LOG(logINFO, ("Detected update mode\n"));
 				debugflag = PROGRAMMING_MODE;
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index 4085604bd..eccbe61df 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -63,7 +63,7 @@ void init_detector() {
 #endif
 	if (isControlServer) {
 	    basictests();
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
 	    if (debugflag != PROGRAMMING_MODE)
 #endif
 	    initControlServer();
@@ -91,7 +91,7 @@ int decode_function(int file_des) {
 		FILE_LOG(logDEBUG3, ("Received %d bytes\n", n ));
 
 	// jungfrau in programming mode
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
 	if ((debugflag == PROGRAMMING_MODE) &&
 			(fnum != F_PROGRAM_FPGA) &&
 			(fnum != F_GET_DETECTOR_TYPE) &&
@@ -2096,7 +2096,7 @@ int set_port(int file_des) {
 int update_client(int file_des) {
 	ret = FORCE_UPDATE;
 	memset(mess, 0, sizeof(mess));
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
 	if (debugflag == PROGRAMMING_MODE) {
 	    ret = OK;
 	}
@@ -3099,7 +3099,7 @@ int program_fpga(int file_des) {
 				}
 			}
 			printf("\n");
-			FILE_LOG(logINFO, ("Done copying program\n"));
+			FILE_LOG(logINFO, ("Done copying program or due to failure earlier\n"));
 
 			// closing file pointer to flash and informing FPGA
 			stopWritingFPGAprogram(fp);
@@ -3112,7 +3112,7 @@ int program_fpga(int file_des) {
 
 			FILE_LOG(logDEBUG1, ("Done with program receiving command\n"));
 
-			if (isControlServer) {
+			if (ret != FAIL && isControlServer) {
 				basictests();
 				initControlServer();
 			}