Scoreboard Fixes

Issue #513