Fixed a lot more. I'm da boss.