some fixes. all right