validates ratings, ratings added
Fixed all the merge conflicts