Added better capability for single/dual joysticks