various fixes part 2