Docs and fixes
Some docs and fixes