Fixed tooltip bug (issue 19) and removed some dead code.