Tweaks to enforce 2-6 players and fix scoreboard updating