Fix assorted text, mentioned in #214, #249

Fixes #214, addresses #249.