Updated a ton of things