fix a bunch of stuff, though it still don't work