Config Tweaks Part1

Still a lot more to go