Disable useless usb stuff, added missed stuff