fixes of task 7