Made Andres' changes and some of my own to Data section.