annotated methods and properties. removed obsolete property and method.
more annotations.
annotation fix.
Merge pull request #401 from stopfstedt/preferences-model-cleanup

Preferences model cleanup