remove helper comments and alter add order
Alter tool tip timing and fix typo