more work on incorporating comments from review
changes for chapter 5
incorporate more changes