Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes