some wording changes and fixes