Rating
Final fixes