Whitespace control, catenation.

Closes #11.
Closes #10.