fixes2

more fixes