some fixes cont 3