Update docs and fixing issues