Doc fixes

Branched off of #63. Ignore first 3 commits until rebased.