Added proper tooltips and bashed a couple of bugs.