Little improvements for chapter 4.