More Scoreboard work and some other tweaks

Just what it says on the tin