Hauks and Rambz fixes, chapter 4.