diff --git a/core/constants.py b/core/constants.py
index a1e2ca5..a93f04e 100644
--- a/core/constants.py
+++ b/core/constants.py
@@ -10,7 +10,7 @@ SIGS = ["POTA", "SOTA", "WWFF", "GMA", "WWBOTA", "HEMA", "MOTA", "ARLHS", "SiOTA
 # Modes. Note "DIGI" and "DIGITAL" are also supported but are normalised into "DATA".
 CW_MODES = ["CW"]
 PHONE_MODES = ["PHONE", "SSB", "USB", "LSB", "AM", "FM", "DV", "DMR", "DSTAR", "C4FM", "M17"]
-DATA_MODES = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "BPSK", "PSK", "BPSK31", "OLIVIA"]
+DATA_MODES = ["DATA", "FT8", "FT4", "RTTY", "SSTV", "JS8", "HELL", "BPSK", "PSK", "PSK31", "BPSK31", "OLIVIA"]
 ALL_MODES = CW_MODES + PHONE_MODES + DATA_MODES
 MODE_TYPES = ["CW", "PHONE", "DATA"]
 
diff --git a/webassets/js/alerts.js b/webassets/js/alerts.js
index c01e365..5e942b0 100644
--- a/webassets/js/alerts.js
+++ b/webassets/js/alerts.js
@@ -221,9 +221,11 @@ function updateRefreshDisplay() {
         if (secSinceUpdate < REFRESH_INTERVAL_SEC) {
             count = REFRESH_INTERVAL_SEC - secSinceUpdate;
             if (count <= 60) {
-                updatingString = "Updating in " + count.toFixed(0) + " seconds...";
+                var number = count.toFixed(0);
+                updatingString = "Updating in " + number + " second" + (number != "1" ? "s" : "") + ".";
             } else {
-                updatingString = "Updating in " + Math.floor(count / 60.0).toFixed(0) + " minutes.";
+                var number = Math.round(count / 60.0).toFixed(0);
+                updatingString = "Updating in " + number + " minute" + (number != "1" ? "s" : "") + ".";
             }
         }
         $("#timing-container").text("Last updated at " + lastUpdateTime.format('HH:mm') + " UTC. " + updatingString);
diff --git a/webassets/js/spots.js b/webassets/js/spots.js
index 4674d63..eadc039 100644
--- a/webassets/js/spots.js
+++ b/webassets/js/spots.js
@@ -315,9 +315,11 @@ function updateRefreshDisplay() {
         if (secSinceUpdate < REFRESH_INTERVAL_SEC) {
             count = REFRESH_INTERVAL_SEC - secSinceUpdate;
             if (count <= 60) {
-                updatingString = "Updating in " + count.toFixed(0) + " seconds...";
+                var number = count.toFixed(0);
+                updatingString = "Updating in " + number + " second" + (number != "1" ? "s" : "") + ".";
             } else {
-                updatingString = "Updating in " + Math.floor(count / 60.0).toFixed(0) + " minutes.";
+                var number = Math.round(count / 60.0).toFixed(0);
+                updatingString = "Updating in " + number + " minute" + (number != "1" ? "s" : "") + ".";
             }
         }
         $("#timing-container").text("Last updated at " + lastUpdateTime.format('HH:mm') + " UTC. " + updatingString);