Scoring system and bug fixes