I also took the time to clean up the config, please see patches.