Corrected swapping bugs. Added game state to protect against swapping while swapping.