add some prefs and fix
omg..