More vignette... and bug fixing.