updated null check

If not found in settings, will look in default settings.  Add ALL new settings to default settings.