Fixed minor and major bugs
Including problems resetting to the initial state after the game is over