Last changes made before the demo
barcode scan improved, scanning stable