Updated everything a ton