Merges Jeff's changes in, with a few Katrina pieces as well
Fixes grammar