Updated a bunch of stuff :D