updated master doc, integrated amy's comments to ch 2
edited first half of chapter 3