Fixed joystick config and cleaned up