fix a bunch of stuff I broke