Chapter 4 changes

Basic edits