Big changes to chapters 2 and 3 after Skype call with Lars