Documentation improvements. Fixes #2004, #2115, #2171.
Merge pull request #2423 from bgrant0607/docfix

Documentation improvements. Fixes #2004, #2115, #2171.