Merge "some fixes in the documentation"