Several text changes more (chapter 2&3)