Finished revisions to chapter 2 and chapter 3