Development

Latest data updates and adjustments. 

cc @dereklieu @dmccarey