some final fixes for task2