did some fixes