add: final part of chapter 5 + overall corrections