homework2

lab2_3, fixes for lab2_1