Finish rating system and few little fixes