fix task3_6, tasks 1-2 from fourth h/w DONE