most of chapter 9 changes
chapter 9 changes finished