Small tweaks after feedback from lcowell
Went crazy on the word counts