bundle
settings improvements;