Docs improvements, lint error fixes.
Merge branch 'scopes-omit'