tried to fix comments. didn't
removed changes for ratings
merge