Tooltip fixes; added TODO