fixed up a lot of stuff…  cant remember