fixes so many fixes