updates from working thru chapter 1