Fix a TON of stuff