UNTESTED. More doc fixes.