More tournament changes

Scoreboard tweaks and shit, too