update settings
this is one dodgy merge...