Fixes and wording