Made config file more consistent with default values