Fixes for the reported sphinx errors 

Just a resync PR before Basic Usage uploads
I wouldn't include this yet, it needs work first, to include the stuff added to support `HierarchicalMNS`.

maybe simply include a reference to the page on the wiki here, for now?