corrections, chp 2&3 finished