Continued improvements to vignette.