Completed Preferences
Merged R into master again.