mostly updates to chapter 5