Massive update, mostly encryption related.