Cleanup of config and addition of failover from environment for settings - some so far not all