updating some fixes