Organising settings - wifi methods.
Final fixes for today.