some fixes2