Minor improvements to settings etc
Merge remote-tracking branch 'origin/master'