Mix and OTP chapter 8 touchup work

Only 2 chapters to go!