Add some TODOs for eerbiceanu
Fix some issues with the tooltip disappearing.