Cleanup and minor fixes
ability to add/remove from GUI

also switch to PreferenceManager for settings