Chapter 3 Updates.

Some updates to Chapter 3 code.