Barcode scanning working (some bugs)