fixed some import stuff
solved some more problems
removed inv because not yet working