diff --git a/plugins/MXSC-1.10.0.jar b/plugins/MXSC-1.10.0.jar
index 7e61ff4..3789066 100644
Binary files a/plugins/MXSC-1.10.0.jar and b/plugins/MXSC-1.10.0.jar differ
diff --git a/script/devices/BarcodeReader.py b/script/devices/BarcodeReader.py
index e1f5b6d..70c5160 100644
--- a/script/devices/BarcodeReader.py
+++ b/script/devices/BarcodeReader.py
@@ -21,14 +21,17 @@ class BarcodeReader(DeviceBase):
         try:
             self.setState(State.Busy)
             microscan.flush()
-            ret =  microscan.waitString(int(timeout * 1000))    
+            ret =  microscan.waitString(int(timeout * 1000)) 
+            if ret is not None:
+                ret = ret.strip()   
             self.setCache(ret, None)
             return ret
         except:
             self.setCache(None, None)
             return None
         finally:
-            self.setState(State.Ready)
+            if self.state == State.Busy:
+                self.setState(State.Ready)
 
     def doUpdate(self):
         self.get()
diff --git a/script/devices/RobotTCP.py b/script/devices/RobotTCP.py
index 33986b1..df4b4e2 100644
--- a/script/devices/RobotTCP.py
+++ b/script/devices/RobotTCP.py
@@ -602,7 +602,7 @@ class RobotTCP(TcpDevice, Stoppable):
                            "mode": self.working_mode,
                            "status": self.status,
                            "open": self.tool_open,
-                           "pos": self.get_current_point_cached() if self.state==State.Ready else None #TODO: make it calculated in robot by possiung funtion 
+                           "pos": self.get_current_point_cached() if self.state==State.Ready else None #TODO: make it calculated in robot by polling funtion 
                            }, None)
             if self.cartesian_motors_enabled:
                 for m in self.cartesian_motors:
diff --git a/script/local.py b/script/local.py
index 4d83de0..168cd01 100644
--- a/script/local.py
+++ b/script/local.py
@@ -17,13 +17,16 @@ run("setup/Layout")
 # Configuration
 ###################################################################################################
 
+IMAGING_ENABLED_PREFERENCE = "imaging_enabled"
+PUCK_TYPES_PREFERENCE = "puck_types"
+BARCODE_READER_SCAN_PUCKS = "barcode_reader_scan_pucks"
 
 def is_imaging_enabled():
-    setting = get_setting("ImagingEnabled")
+    setting = get_setting(IMAGING_ENABLED_PREFERENCE)
     return not (str(setting) == 'False')
 
 def set_imaging_enabled(value):
-    set_setting("ImagingEnabled", True if value else False )
+    set_setting(IMAGING_ENABLED_PREFERENCE, True if value else False )
 
 def assert_imaging_enabled():
     if is_imaging_enabled() == False:
@@ -31,17 +34,27 @@ def assert_imaging_enabled():
 
 #"unipuck", "minispine" or "mixed"
 def set_puck_types(value):
-    set_setting("ImagingEnabled", True if value else False )
+    set_setting(PUCK_TYPES_PREFERENCE, True if value else False )
     
 def get_puck_types():
-    setting = get_setting("ImagingEnabled")
+    setting = get_setting(PUCK_TYPES_PREFERENCE)
     if setting == "unipuck" or  setting == "minispine":
         return setting
     return "mixed"
 
+
+def is_barcode_reader_scan_pucks():
+    setting = get_setting(BARCODE_READER_SCAN_PUCKS)
+    return False if setting is None else setting.lower() == "true" 
+
+def set_barcode_reader_scan_pucks(value):
+    set_setting(BARCODE_READER_SCAN_PUCKS, True if value else False )
+  
+
 #In order to apply current config
 set_imaging_enabled(is_imaging_enabled())    
 set_puck_types(get_puck_types())
+set_barcode_reader_scan_pucks(is_barcode_reader_scan_pucks())
 
 ###################################################################################################
 #  Scripted devices and pseudo-devices
diff --git a/script/test/TestCameraStability1.py b/script/test/TestCameraStability1.py
new file mode 100644
index 0000000..e4660e9
--- /dev/null
+++ b/script/test/TestCameraStability1.py
@@ -0,0 +1,11 @@
+for i in range(10):
+    time.sleep(2)
+    move_home()
+    time.sleep(1)
+    move_park()
+    start = time.time()
+    while get_img_cover_pos() != 'A':
+        print ".",
+        time.sleep(0.001)
+    print "Time = " , ( time.time() - start)
+    
\ No newline at end of file
diff --git a/script/test/TestCameraStability2.py b/script/test/TestCameraStability2.py
new file mode 100644
index 0000000..30ef8bc
--- /dev/null
+++ b/script/test/TestCameraStability2.py
@@ -0,0 +1,11 @@
+cover_detection_debug=False
+
+for pos in ['A', 'B', 'C', 'D', 'E', 'F']:
+    print "Moving to ", pos
+    hexiposi.move(pos)
+    ret =  run("imgproc/CoverDetection")
+    det =  ret[0]
+    print "Detected: ", det
+    if det != pos:
+        raise "Position error"
+
diff --git a/script/test/TestCameraStability3.py b/script/test/TestCameraStability3.py
new file mode 100644
index 0000000..bcf1327
--- /dev/null
+++ b/script/test/TestCameraStability3.py
@@ -0,0 +1,9 @@
+for i in range(10):
+    time.sleep(1)
+    move_home()
+    time.sleep(1)
+    move_park()
+    start = time.time()
+    time.sleep(1.0)
+    print run("imgproc/LedDetectionProc.py")
+    
\ No newline at end of file