Cleaned up the config.xml a bit