Task 2 + fixes on task 2