so many fixes