Several changes to HW04

Almost done.