Fix up some comments, styling, ok message
Simplify pref resetting.
clean up comment