Some more documentation improvements
Merged.