Fixed *x* and the like in Chapter 1 & 2
Overhaul Chapter 2 and some fixes in Chapter 1