wording and code fixes