Hopefully better support for multiple joysticks and unstable numbering