some fixes. . pre merge