Reorganize USB handling.
Misc updates.