Spectator mode works, scoreboard update, code cleaning