Release preparation branch

Fixing up doc blocks

Still WIP - more changes to come.