revamp USB checks
lots of changes to accommodate Paul's new content
more merging of Paul's content