added tooltip and highlight