Sizing improvements, and beginning of vignette