Fixes / improvements wording