Doc touchups
Merge branch 'docs' into dev