Various changes to settings I didn't like