ch3 and 4 edits from editor feedback