Restructured vignette content
Added discard option to loc functions.