Some more Luna USB changes

Not done adding stuff in yet.