Tweak labels and remove uninteresting graphs
Update datasource names.