Fixing a ton of stuff