fixed up  a bunch of things