Updates and fixes to matches and scoring