Mostly changes to comments; testing github - want to see if my changes will merge nicely with Katherine's.