One monster update to bring everything up to standards...