Updated a bunch of stuff, lol