Mostly updates to chapter 0