update various prefs
merge