port document from @cv from GH
small fixes
more small fixes