[ISSUE-2] Docs and fixes