Rounds reset properly with player swapping, lots of little bug fixes discovered from this