Some preliminary changes for detecting round end... may just skip that in favor of when the next map is set, though.