[task3] - more fixes