Update documentation, and a couple of things that disagreed with the docs.