Complete Basic CountState

bug fixes when re-iterating through new rounds.