mostly finished editing pass through chapter 2