Updated a ton of stuff