some fixes cont