Lots of config tweaks