Some documentation updates
Merge branch 'working'