Further improvements in wording, etc.