Updates related to final draft of chpater 2 and samples.