Finish chapter 2 exercises, slightly modify chapter 1 notes.