Preferences are now sorted, and comments are prettier.
Merge origin/master