scoreboard and ball controller fixes and cleanup