added vignette option; further reduced yelling