diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml
index aa515bb6a1..506189b1e3 100644
--- a/.github/workflows/cpp-ci-serial-programs-base.yml
+++ b/.github/workflows/cpp-ci-serial-programs-base.yml
@@ -49,16 +49,16 @@ jobs:
       - name: Checkout Arduino-Source
         uses: actions/checkout@v7
         with:
-          path: 'Arduino-Source'
-          submodules: 'recursive'
+          path: "Arduino-Source"
+          submodules: "recursive"
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
           # Delete aqtsource once https://github.com/miurahr/aqtinstall/issues/1007 is fixed and released
-          aqtsource: 'git+https://github.com/miurahr/aqtinstall'
-          version: '6.10.2'
-          modules: 'qtmultimedia qtserialport'
+          aqtsource: "git+https://github.com/miurahr/aqtinstall"
+          version: "6.10.2"
+          modules: "qtmultimedia qtserialport"
 
       - name: Install dependencies (Ubuntu)
         if: startsWith(inputs.os, 'ubuntu')
@@ -118,8 +118,8 @@ jobs:
         uses: actions/checkout@v7
         if: inputs.run-tests
         with:
-          repository: 'PokemonAutomation/CommandLineTests'
-          path: 'CommandLineTests'
+          repository: "PokemonAutomation/CommandLineTests"
+          path: "CommandLineTests"
 
       - name: Run tests (Windows)
         if: startsWith(inputs.os, 'windows') && inputs.run-tests
@@ -150,7 +150,7 @@ jobs:
 
       - name: Run clang query
         if: inputs.run-clang-query
-        run : |
+        run: |
           cd Arduino-Source
 
           cat << 'EOF' > query.txt
@@ -181,4 +181,4 @@ jobs:
           name: Clang query output (compiler=${{inputs.compiler}})
           path: |
             Arduino-Source/SerialPrograms/bin/compile_commands.json
-            Arduino-Source/clang-query-output.txt
\ No newline at end of file
+            Arduino-Source/clang-query-output.txt
diff --git a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
index cdf8dc6dd7..19eff37f08 100644
--- a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
+++ b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Mac Intel
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/.github/workflows/cpp-ci-serial-programs-mac.yml b/.github/workflows/cpp-ci-serial-programs-mac.yml
index 3a59c7d0ef..5201d80e72 100644
--- a/.github/workflows/cpp-ci-serial-programs-mac.yml
+++ b/.github/workflows/cpp-ci-serial-programs-mac.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Mac
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
index 8e4abbb2f5..647b30ffb1 100644
--- a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Ubuntu clang
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
index b84887ef05..67f893da52 100644
--- a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Ubuntu Default
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
index b725cc4c98..0fe396f0d3 100644
--- a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
+++ b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Windows Clang
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-default.yml b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
index 35940e1c94..378f7954f1 100644
--- a/.github/workflows/cpp-ci-serial-programs-windows-default.yml
+++ b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
@@ -1,10 +1,19 @@
 name: C++ CI Serial Programs Windows Default
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.stack.number || 
+        github.event.pull_request.number || 
+        github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
index 6203e1223f..f85550b270 100644
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
+++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
@@ -10,16 +10,13 @@ Optimise the swapping algo
 Add enum for ball ? Also, BDSP is reading from swsh data. Worth refactoring ?
 
 ideas for more checks :
-ability
 nature
-type
 original game
 OT
 moves
 stats
 level
 surname
-language
 "stamps"
 */