More changes on doc.
More fixes on doc.