wrong reference of Settings instead of Defaults
minor changes