tooltip refactor COMPLETE!