Chapter 1 & 2 code updates for final review.