Fix stupid stuff
bunch of stuff