Fix import issue.
Fixup comments.
Fix location of default preferences.