some fixes part 2