add chapter 2, clean up