HW4

More HW4 fixes