Quite a clean up
Preferences cleanup; some methods moved to more logical places;