new ratings model and fixed form helpers
merge conflict fixed