adding some fixes.. i forget what