Added the requested tooltips on #79