addressed Peter's comments in first few sections