vignettes cleaned up