update for some fixes