cleans up code and fixes new game error