More work on Chapter 04s.