last fixes part 1