many fixes lol