Updated data and improved geoms