Corrected cross references. Did most todo notes. Other minor edits, phrasing.