Fixes for task 2
HW2 Task 3 - initial check-in