many fixes yo