changes some fixes