lot of different fixes