Partial comments from Cyril sent on 7/8

Address some of Cyril's comments. See Ina's reply to the mailing list on
7/18