Chapter 1-6 correction and updates.