Adding tooltips and finishing data reorganization