adds some fixes