cleaning up and a few tweaks for the tooltip for now