fixing a lot of stuff