Chapter 2 improvements (Thanks for the w3 link @timmfin)