more tooltip bug fixes