Lots of additions to chapter 2