Validate user is in party, minor tweaks.