final fixes for exercises