updates to limit returns and clean up data for v2