Made improvements to ToolTip -- NOT COMPLETE