Updated a bunch of things