ironing out last kinks in tooltip refactor