Fixed a lot of stuff