Integrate tooltips and code cleanup/fix bugs, see #166