more chapter 6 stuff and some chapter 5