diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 25aac87da..32f93c122 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -177,6 +177,7 @@ int mapCSP0(void) {
   address = FIFO_DATA_REG_OFF;
   values=(u_int16_t*)(CSP0BASE+address*2);
   printf("statusreg=%08x\n",bus_r(STATUS_REG));
+  printf("\n\n");
   return OK;
 }
 
@@ -256,7 +257,7 @@ int setPhaseShiftOnce(){
 
 int cleanFifo(){
 	u_int32_t addr, reg, val;
-	printf("\nCleaning FIFO\n");
+	printf("Cleaning FIFO\n");
 	addr=ADC_SYNC_REG;
 
 	//88332214
@@ -763,7 +764,7 @@ u_int32_t  getFirmwareSVNVersion(){
 
 // for fpga test 
 u_int32_t testFpga(void) {
-  printf("Test FPGA:\n");
+  printf("Testing FPGA:\n");
   volatile u_int32_t val,addr,val2;
   int result=OK,i;
   //fixed pattern
@@ -812,8 +813,9 @@ u_int32_t testFpga(void) {
     {
       printf("----------------------------------------------------------------------------------------------");
       printf("\nATTEMPT 1000000: FPGA DUMMY REGISTER OK!!!\n");
-      printf("----------------------------------------------------------------------------------------------\n");
+      printf("----------------------------------------------------------------------------------------------");
     }
+  printf("\n");
   return result;
 }
 
@@ -825,7 +827,7 @@ u_int32_t testRAM(void) {
   allocateRAM();
   //  while(i<100000) {
     memcpy(ram_values, values, dataBytes);
-    printf ("Test RAM:\t%d: copied fifo %x to memory %x size %d\n",i++, (unsigned int)(values), (unsigned int)(ram_values), dataBytes);
+    printf ("Testing RAM:\t%d: copied fifo %x to memory %x size %d\n",i++, (unsigned int)(values), (unsigned int)(ram_values), dataBytes);
     // }
   return result;
 }
@@ -1891,6 +1893,7 @@ int allocateRAM() {
 
 }
 int prepareADC(){
+  printf("Preparing ADC\n");
   u_int32_t valw,codata,csmask;              
   int i,cdx,ddx;
    cdx=0; ddx=1;
@@ -1902,11 +1905,17 @@ int prepareADC(){
      valw=((0xffffffff&(~csmask)));bus_w(ADC_WRITE_REG,valw); //chip sel bar down
     for (i=0;i<24;i++) {
       valw=valw&(~(0x1<<cdx));bus_w(ADC_WRITE_REG,valw);usleep(0); //cldwn  
+#ifdef VERBOSE
       printf("DOWN 0x%x \n",valw);
+#endif
       valw=(valw&(~(0x1<<ddx)))+(((codata>>(23-i))&0x1)<<ddx); bus_w(ADC_WRITE_REG,valw); usleep(0); //write data (i)
+#ifdef VERBOSE
       printf("LOW 0x%x \n",valw);
+#endif
       valw=valw+(0x1<<cdx);bus_w(ADC_WRITE_REG,valw); usleep(0); //clkup
- printf("up  0x%x \n",valw);
+#ifdef VERBOSE
+      printf("up  0x%x \n",valw);
+#endif
     } 
 
  valw=valw&(~(0x1<<cdx));usleep(0);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer
index d635272a1..9117d3005 100755
Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer differ
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server.c b/slsDetectorSoftware/gotthardDetectorServer/server.c
index 7ac3303cc..2a61aeac6 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	if (argc==1) {
 		portno = DEFAULT_PORTNO;
 		sprintf(cmd,"%s %d &",argv[0],DEFAULT_PORTNO+1);
-		printf("opening control server on port %d\n",portno );
+		printf("\n\nControl Server\nOpening control server on port %d\n",portno );
 		system(cmd);
 		b=1;
 	} else {
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 			return 1;
 		}
 		b=0;
-		printf("opening stop server on port %d\n",portno);
+		printf("\n\nStop Server\nOpening stop server on port %d\n",portno);
 	}
 	init_detector(b);
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 13823e658..a07bfb2d7 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -70,16 +70,15 @@ int init_detector( int b) {
 	  exit(-1);
   }
 
-  //check if it is really gotthard
   check_detector_type();
-  printf("\n***This is a GOTTHARD detector with %d chips per module***\n", NCHIP);
+  if(b)
+	  printf("***This is a GOTTHARD detector with %d chips per module***\n", NCHIP);
 
-
-  //testFpga();
   if (b) {
+
 #ifdef MCB_FUNCS
     initDetector();
-    printf("Initializing Detector completed.\n\n");
+    printf("Initializing Detector\n");
 #endif
     testFpga();
     testRAM();