Fixes stuff
stuff to make it work I think