More chap03 edits