Text tweaks.

Fixes #179 and #180.