More support for joysticks. Changed settings structure.