lots of word tagging/editing. some minor style updates.