Separate out some of the non-USB changes for easy review.
Merge pull request #522 from nomis52/master

Separate out some of the non-USB changes for easy review.