Tasks 1:5 revisisted

Mostly 2nd fixed, 6 in the middle