Ghost game fix & improvements