diff --git a/Software/Gravity/Interactions.ino b/Software/Gravity/Interactions.ino
index 25781ab..45afd84 100644
--- a/Software/Gravity/Interactions.ino
+++ b/Software/Gravity/Interactions.ino
@@ -371,12 +371,13 @@ void checkInputs() {
   if (!digitalRead(START_STOP_BTN_PIN) && !playBtnPushed) {
     if (masterClockMode == 0) {
       calculateBPMTiming();
-      resetClocks();
       if (!isPlaying) {
+        resetClocks();
         isPlaying = true;
         sendMIDIStart();
       } else {
         isPlaying = false;
+        resetClocks();
         sendMIDIStop();
       }
     }
diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino
index fd4f9e0..cae745b 100644
--- a/Software/Gravity/UI.ino
+++ b/Software/Gravity/UI.ino
@@ -259,10 +259,11 @@ void updateScreen() {
         }
       }
 
-      valueStr = F("t");
       if (masterClockMode == 0 && !isPlaying) {
+        valueStr = F("t");
         u8g2.drawUTF8(121, yPos, valueStr.c_str() );
       } else if (masterClockMode == 0 && isPlaying)  {
+        valueStr = F("r");
         u8g2.drawUTF8(122, yPos, valueStr.c_str() );
       }
     }