meking some fixes