Fixed some bugs with joystick reconnect on touch and with #19..