Add better handling of time values when the times aren't defined. Fix formatting of the config values for two config values.