plugin cleanup;
fixed barcode scanning