fixing a bunch of things
more