adding some fixes2