Fixing a lot of stuff I don't remember