Added Chapter 7

Added Chapter 7 and some other fixes