Slight changes for startParty. Other ones should be better.
Fixed merge changes