more some fixes