improved wording in several places