Chapter 2.5 remaining part + typo fixes first part