final fixes part 2