changes wording and small code fix up