yeah some fixes