more work on chapter 2, some citation todos
Merge branch 'origin/master'