Tweaks to wording and extra things defined