rating is now optional
Merge branch 'ratings'