Barcode Scanner
Small changes and fixes