diff --git a/frontend/__tests__/utils/strings.spec.ts b/frontend/__tests__/utils/strings.spec.ts
index c76d93f8f27c..293cd57c01bc 100644
--- a/frontend/__tests__/utils/strings.spec.ts
+++ b/frontend/__tests__/utils/strings.spec.ts
@@ -1041,6 +1041,38 @@ describe("string utils", () => {
             missed: 0,
           },
         },
+        {
+          description: "count extra chars as extra",
+          input: {
+            inputWord: "abcx",
+            targetWord: "abc ",
+            lastWord: true,
+            shouldLastPartialWordCount: true,
+          },
+          expected: {
+            allCorrect: 3,
+            correctWord: 0,
+            incorrect: 0,
+            extra: 1,
+            missed: 0,
+          },
+        },
+        {
+          description: "count extra chars as extra (with space)",
+          input: {
+            inputWord: "abcx ",
+            targetWord: "abc ",
+            lastWord: true,
+            shouldLastPartialWordCount: true,
+          },
+          expected: {
+            allCorrect: 3,
+            correctWord: 0,
+            incorrect: 1,
+            extra: 1,
+            missed: 0,
+          },
+        },
       ];
 
       it.each(testCases)("$description", ({ input, expected }) => {
diff --git a/frontend/src/ts/components/pages/account/HistoryChart.tsx b/frontend/src/ts/components/pages/account/HistoryChart.tsx
index d79c4f591d7a..2b67022e8a5c 100644
--- a/frontend/src/ts/components/pages/account/HistoryChart.tsx
+++ b/frontend/src/ts/components/pages/account/HistoryChart.tsx
@@ -318,7 +318,7 @@ export function HistoryChart(props: {
       </div>
       <div class="grid grid-cols-1 items-center lg:grid-cols-[1fr_30rem]">
         <Trend results={props.results} />
-        <div class="grid grid-cols-4 gap-2 text-em-xs">
+        <div class="grid grid-cols-4 gap-2 text-em-xs max-[475px]:grid-cols-2">
           <Button
             fa={{ icon: "fa-tachometer-alt", fixedWidth: true }}
             text="Speed"
diff --git a/frontend/src/ts/components/pages/settings/custom-setting/Theme.tsx b/frontend/src/ts/components/pages/settings/custom-setting/Theme.tsx
index 02ef976b177a..9b30d31eaa64 100644
--- a/frontend/src/ts/components/pages/settings/custom-setting/Theme.tsx
+++ b/frontend/src/ts/components/pages/settings/custom-setting/Theme.tsx
@@ -570,7 +570,7 @@ function Picker(props: { color: ColorName }): JSXElement {
     >
       <div>{text()}</div>
       <input
-        // class="text-center"
+        class="w-full"
         type="text"
         value={getTheme()[props.color]}
         onChange={(e) => {
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index 8979f2faf244..a4ab1ccd2848 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -115,6 +115,7 @@ import {
   getKeypressesPerSecond,
 } from "./events/stats";
 import { calculateWpm } from "../utils/numbers";
+import { isDevEnvironment } from "../utils/env";
 
 let failReason = "";
 
@@ -910,7 +911,7 @@ function buildCompletedEvent(
   return completedEvent;
 }
 
-const ALWAYSREPORT = false;
+const ALWAYSREPORT = isDevEnvironment() || false;
 
 // window.ce2 = buildCompletedEvent2;
 
@@ -1282,7 +1283,7 @@ function compareCompletedEvents(
             difficulty: ce.difficulty,
             duration: ce.testDuration,
             funboxes: getActiveFunboxNames().join(","),
-            version: 5,
+            version: 7,
             // ce: ce as Record<string, unknown>,
             // ce2: ce2 as Record<string, unknown>,
           },
diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts
index bc86e0073edb..c13373c654c0 100644
--- a/frontend/src/ts/test/test-stats.ts
+++ b/frontend/src/ts/test/test-stats.ts
@@ -285,8 +285,8 @@ function countChars(final = false): CharCount {
       countCharsUtils(
         inputWord,
         targetWord,
-        !final || (i === inputWords.length - 1 && final),
-        isTimedTest,
+        i === inputWords.length - 1,
+        (isTimedTest && final) || !final,
       );
 
     correctWordChars += correctWord;
diff --git a/frontend/src/ts/utils/strings.ts b/frontend/src/ts/utils/strings.ts
index 463da5ca46eb..ff10c2e8b724 100644
--- a/frontend/src/ts/utils/strings.ts
+++ b/frontend/src/ts/utils/strings.ts
@@ -449,8 +449,11 @@ export function countChars(
       if (!(lastWord && shouldLastPartialWordCount)) {
         missed += 1;
       }
-    } else if (targetChar === undefined) {
-      //extra char
+    } else if (
+      targetChar === undefined ||
+      (targetChar === " " && inputChar !== " " && !inputWord.includes(" "))
+    ) {
+      //extra char (past target, or typed in place of word-ending space)
       extra += 1;
     } else {
       //incorrect char
diff --git a/packages/contracts/src/results.ts b/packages/contracts/src/results.ts
index 96ad178a2177..a260e4de41af 100644
--- a/packages/contracts/src/results.ts
+++ b/packages/contracts/src/results.ts
@@ -75,7 +75,7 @@ export const ReportCompletedEventMismatchRequestSchema = z.object({
   difficulty: DifficultySchema.optional(),
   duration: z.number().max(200).optional(),
   funboxes: z.string().max(100).optional(),
-  version: z.literal(5),
+  version: z.literal(7),
   // ce: z.record(z.unknown()),
   // ce2: z.record(z.unknown()),
 });