more fixes2