Tweaks to scoreboard