Added tooltips, and fixed a major bug