better USB handling