doc fixes
Merge branch 'documentation'