Doc fixes

Commit 029b70e is more like a proof of concept, it has some issues noted in its commit message.
Same for this.