Fixed up the config parser a bit.