many updates from doc/doc commit 54d3ea44c454454c6be2cabe5fc4ac8e983dd324