Word wrap additions.

Closes #196 and closes #197.