More docstring updates

Should be considered after the file caching pull request.  (This branch is one commit ahead of the 'caching' branch.)