some more fixes part 4