some fixes 999