Fixed task 2.2.2 and minor bug in 2.3