Fixed party stuff.
Fixed merge conflicts.