Updated some of the documentation information.

Note: some of the random changes here were due to the doctest failures, which I have now fixed.