More Issue #39 work (documentation).