zad1/cw10 finished, only small improvements needed