Chapter2stuff

Update to chapter 2 programs