Shortened variable names in returned list
minor editing and order changes to vignette