corrections 0auth related on the document 2/3
merge conflicts