More vignette work.

Including correcting functions…