docs fixes, tracking down some weird errors
Merge branch 'docs-fix'