Some modifications to chapter 2 and 3 from KH and PES