More fixes on the document