some fixes 2