some fixes home