tooltip fixes

slight improvement for tooltip function