Fix tooltips and dupe bug