Adding in support for Tooltips and putting them into the Demo, also removing some unused demo code.