Code updates.

Added delegate for showToolTip function, and some other changes.