HW #3 fixes, start of HW#4