Minor improvements to whitening.