Fixed A TON of Bugs