Improvements/fixes to get scoreboard working for r+ users.