updated a ton of stuff