bug fixes for barcode dock logic (more to come)