Fixed a LOT of stuff