task 2.1 fixes