Greatly simplified game play including some bugfixes