Some tuning and some wording