Fix cancelled games persisting bug and prepared for making new games