Finished rating feature
Fixed conflict