settings fixes
merge