Improvements in chapter 8.