mk4 - Even more fixes

HW3 tasks 1 through 7 fixed partially