some more fixes part 3