homework6 fixes. homework7 started