Fixing HW3 and starting fixup of HW4