refactor/fix switching profile with separate settings
minor tweaks