tweaks and ToolTip additions