fixing some stuff
hopefully this works