More Doc fixes

This rounds out the changes started in PR #121