Fixed problem with overlapping in the joystick class
Bug fixes