Cleanup config, tweak some values