some tweaks + a fix for Prefs