Improved wording here and there