doing some fixes