diff --git a/core.js b/core.js
index f277b72..4ced861 100644
--- a/core.js
+++ b/core.js
@@ -1420,6 +1420,7 @@ const update_finetune_warning_messages = (() => {
 
             clearTimeout(timeout);
             timeout = setTimeout(() => {
+                if(finetune.mode !== 'center') return; // in case it changed during timeout
                 $(`#finetuneCenter${isNearCenter? 'Warning' : 'Success'}`).hide();
                 $(`#finetuneCenter${isNearCenter? 'Success' : 'Warning'}`).show();
                 timeout = null;
@@ -2434,6 +2435,7 @@ function process_ds4_input({data}) {
 
     const current_active_tab = get_current_main_tab();
     if(current_active_tab === 'controller-tab') {
+        collectCircularityData(changes.sticks, ll_data, rr_data);
         update_stick_graphics(changes, { is_ds5: false });
         update_ds_button_svg(changes, DS4_BUTTON_MAP);
 
diff --git a/index.html b/index.html
index 96bba91..69355d0 100644
--- a/index.html
+++ b/index.html
@@ -587,11 +587,11 @@ input[id^="finetune"] {
           <i class="fas fa-info-circle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">Move the stick to select it for tuning, then without touching the stick use the D-pad buttons to adjust the center point. Flick it and adjust it again if it is off center or flickers.</span>
         </div>
-        <div class="alert alert-warning finetune-center-mode" role="alert" id="finetuneCenterWarning" style="display: none;">
+        <div class="alert alert-warning finetune-center-mode" role="alert" id="finetuneCenterWarning">
           <i class="fas fa-exclamation-triangle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">Please release the stick to center position before adjusting with D-pad buttons.</span>
         </div>
-        <div class="alert alert-success finetune-center-mode" role="alert" id="finetuneCenterSuccess" style="display: none;">
+        <div class="alert alert-success finetune-center-mode" role="alert" id="finetuneCenterSuccess">
           <i class="fas fa-check-circle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">Press the D-pad or face buttons in the direction you want the stick position to move.</span>
         </div>
@@ -599,11 +599,11 @@ input[id^="finetune"] {
           <i class="fas fa-info-circle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">While holding the stick to be adjusted straight up/down/left/right, <em>observe the highlighted value below the circle</em>, then use the D-pad buttons to adjust the value to ±0.99 (just below ±1.00).</span>
         </div>
-        <div class="alert alert-warning finetune-circularity-mode" role="alert" id="finetuneCircularityWarning" style="display: none;">
+        <div class="alert alert-warning finetune-circularity-mode" role="alert" id="finetuneCircularityWarning">
           <i class="fas fa-exclamation-triangle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">Push the stick straight up/down/left/right as far as possible.</span>
         </div>
-        <div class="alert alert-success finetune-circularity-mode" role="alert" id="finetuneCircularitySuccess" style="display: none;">
+        <div class="alert alert-success finetune-circularity-mode" role="alert" id="finetuneCircularitySuccess">
           <i class="fas fa-check-circle"></i>&nbsp;&nbsp;
           <span class="ds-i18n">Press the D-pad or face buttons in the direction you want the stick position to move.</span>
         </div>