Docs changes and fix