HW 2, Pt 3 fixes after autograding