#588, plus other wording items