Fixed a ton of Code