Fixes and Task 4