Continued working on nacl gamepad support