first complete vignette; small bug fixes