Fixed Joystick issues and fixed the restart issue