Monday's commit. Just one bugfix and some Barcode scanning work