Fix several docstrings
Merge pull request #4270 from dlindquist/develop

Fix several docstrings