[#22] Lot's of minor textual tweaks

Fixes #22