Docs and fixes, notes