More updates to chapter 1, with a few updates to chapter 2.1

.