Fixed a lot of stuff lol