fixing a bunch of things