Changed a bunch of stuff lol