update documentation
merge conflics and fix typos