finish chapter 5 draft
overall cleanup