did a few more small fixes including large (update to chapter 6)