Some more cleanup, add handling of itemtooltip event