Corrections and todos in chapter 4