Updated chapters 1-3 and part of 4.