fixing a bunch of stuff.