Fixed a few bugs, and did world reset after round