fixed up a lot of things