Some config changes, I actually don't recall them all.
Merged stuff.