fixes based on review of chapter 3