Fixup TextZone constructors and general cleanup

Fixes #31