Updated chapters 2 and 3 with content