updated prefs
fixed conflicts