diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp
index 75ebed13b..dc25601d8 100755
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@@ -486,19 +486,16 @@ void DetectorImpl::readFrameFromReceiver() {
                     if (image == nullptr) {
                         // allocate
                         size = doc["size"].GetUint();
-			//std::cout << "SIZE: "<< size << 	std::endl;
                         multisize = size * zmqSocket.size();
                         image = new char[size];
                         multiframe = new char[multisize];
                         memset(multiframe, 0xFF, multisize);
                         // dynamic range
-			// dynamicRange = doc["bitmode"].GetUint();
+			            dynamicRange = doc["bitmode"].GetUint();
                         bytesPerPixel = (float)dynamicRange / 8;
-			//	std::cout << "DR: "<< dynamicRange << 	std::endl;
                         // shape
                         nPixelsX = doc["shape"][0].GetUint();
                         nPixelsY = doc["shape"][1].GetUint();
-			//	std::cout << "shape: "<< nPixelsX << " "<< nPixelsY << 	std::endl;
                         // detector shape
                         nX = doc["detshape"][0].GetUint();
                         nY = doc["detshape"][1].GetUint();
@@ -515,9 +512,9 @@ void DetectorImpl::readFrameFromReceiver() {
                             (doc["gappixels"].GetUint() == 0) ? false : true;
                         quadEnable =
                             (doc["quad"].GetUint() == 0) ? false : true;
-			FILE_LOG(logDEBUG1)
-			  << "One Time Header Info:"
-                               "\n\tsize: "
+                        FILE_LOG(logDEBUG1)
+                            << "One Time Header Info:"
+                            "\n\tsize: "
                             << size << "\n\tmultisize: " << multisize
                             << "\n\tdynamicRange: " << dynamicRange
                             << "\n\tbytesPerPixel: " << bytesPerPixel
@@ -525,7 +522,7 @@ void DetectorImpl::readFrameFromReceiver() {
                             << "\n\tnPixelsY: " << nPixelsY << "\n\tnX: " << nX
                             << "\n\tnY: " << nY << "\n\teiger: " << eiger
                             << "\n\tgappixelsenable: " << gappixelsenable
-				    << "\n\tquadEnable: " << quadEnable;
+                            << "\n\tquadEnable: " << quadEnable;
                     }
                     // each time, parse rest of header
                     currentFileName = doc["fname"].GetString();
@@ -539,9 +536,9 @@ void DetectorImpl::readFrameFromReceiver() {
                         coordY = (nY - 1) - coordY;
                     }
                     flippedDataX = doc["flippedDataX"].GetUint();
-		    FILE_LOG(logDEBUG1)
-		      << "Header Info:"
-                           "\n\tcurrentFileName: "
+		            FILE_LOG(logDEBUG1)
+		                << "Header Info:"
+                        "\n\tcurrentFileName: "
                         << currentFileName << "\n\tcurrentAcquisitionIndex: "
                         << currentAcquisitionIndex
                         << "\n\tcurrentFrameIndex: " << currentFrameIndex
@@ -560,16 +557,14 @@ void DetectorImpl::readFrameFromReceiver() {
                     uint32_t yoffset = coordY * nPixelsY;
                     uint32_t singledetrowoffset = nPixelsX * bytesPerPixel;
                     uint32_t rowoffset = nX * singledetrowoffset;
-		    if (multi_shm()->multiDetectorType == CHIPTESTBOARD) {
+		            if (multi_shm()->multiDetectorType == CHIPTESTBOARD) {
                         singledetrowoffset = size;
-			nPixelsY=1;
-			
-		    }
+			            nPixelsY = 1; // TODO: nDetPixelsY is not updated.
+		            }
 
-
-                   FILE_LOG(logDEBUG1)
-		     << "Multi Image Info:"
-                           "\n\txoffset: "
+                    FILE_LOG(logDEBUG1)
+		            << "Multi Image Info:"
+                        "\n\txoffset: "
                         << xoffset << "\n\tyoffset: " << yoffset
                         << "\n\tsingledetrowoffset: " << singledetrowoffset
                         << "\n\trowoffset: " << rowoffset;
@@ -585,7 +580,6 @@ void DetectorImpl::readFrameFromReceiver() {
                         }
                     } else {
                         for (uint32_t i = 0; i < nPixelsY; ++i) {
-
                             memcpy((multiframe) + ((yoffset + i) * rowoffset) +
                                        xoffset,
                                    image + (i * singledetrowoffset),
@@ -595,11 +589,11 @@ void DetectorImpl::readFrameFromReceiver() {
                 }
             }
         }
- FILE_LOG(logDEBUG)<< "Call Back Info:"
-                           << "\n\t nDetPixelsX: " << nDetPixelsX
-                           << "\n\t nDetPixelsY: " << nDetPixelsY
-                           << "\n\t databytes: " << multisize
-		  << "\n\t dynamicRange: " << dynamicRange ;
+        FILE_LOG(logDEBUG)<< "Call Back Info:"
+            << "\n\t nDetPixelsX: " << nDetPixelsX
+            << "\n\t nDetPixelsY: " << nDetPixelsY
+            << "\n\t databytes: " << multisize
+		    << "\n\t dynamicRange: " << dynamicRange ;
 
         // send data to callback
         if (data) {
@@ -616,10 +610,10 @@ void DetectorImpl::readFrameFromReceiver() {
                 int n = processImageWithGapPixels(multiframe, multigappixels,
                                                   quadEnable);
                 FILE_LOG(logDEBUG) 
-		  	 << "Call Back Info Recalculated:"
-                                   << "\n\t nDetPixelsX: " << nDetPixelsX
-                                   << "\n\t nDetPixelsY: " << nDetPixelsY
-                                   << "\n\t databytes: " << n;
+		  	        << "Call Back Info Recalculated:"
+                    << "\n\t nDetPixelsX: " << nDetPixelsX
+                    << "\n\t nDetPixelsY: " << nDetPixelsY
+                    << "\n\t databytes: " << n;
                 thisData =
                     new detectorData(getCurrentProgress(), currentFileName,
                                      nDetPixelsX, nDetPixelsY, multigappixels,