Integrate editing for Chapter 17
Integrate editing for Chapter 18
fixed a variable name in comment
Fix typo