fix something in task 2 & 5