Vignette getting cleaned up, as are docs