Small re-wordings and fixes