Issue 194 (haddock only)

I've aggregated the state of #194 into the doc comments.