Task 2.3 done, some small fixes to 2.2