Fix usb and some changes