change some wording and cater to daniel's pedantry