Added to preferences, basic cleanup