Fix documentation to reflect current state.

A few fixups for documentation.