fixed some tooltip issues