More message tweaks, eliminate "party"