more work on the last two chapters