Minor changes to game flow and class functions