fixing a lot of things