More changes to chapter 2, more figures.