fix a bunch of things