Config file rehaul. Organized the comments.
Moved hacks out of main files