Some minor cleanup.
More doc updates.