Stuff for testing.
Formatting fixes.
Get rid of the special purpose nonsense in the config.