Chapter 3 almost complete and other small fixes