Buncha changes to chapter 3. I owe Roseanne big time for this...