some fixes cont 2