bug fix and add some tooltip