Some doc updates
Merge some doc fixes.