Added tooltops and fixed If-statement