fixed some fixes