updated some fixes