more cleanup of error handling behavior and additional usb command handling