finished chapter 5, layout tests, etc