fixed task16
fixed smth
fixed task 2 and task16