diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml
index aa515bb6a1..cee575932e 100644
--- a/.github/workflows/cpp-ci-serial-programs-base.yml
+++ b/.github/workflows/cpp-ci-serial-programs-base.yml
@@ -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..9dd5ac6cc2 100644
--- a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
+++ b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Mac Intel
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: macos-15-intel
diff --git a/.github/workflows/cpp-ci-serial-programs-mac.yml b/.github/workflows/cpp-ci-serial-programs-mac.yml
index 3a59c7d0ef..81c44f9d36 100644
--- a/.github/workflows/cpp-ci-serial-programs-mac.yml
+++ b/.github/workflows/cpp-ci-serial-programs-mac.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Mac
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: macos-15
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
index 8e4abbb2f5..c2bec4d576 100644
--- a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Ubuntu clang
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: ubuntu-26.04
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
index b84887ef05..a61c6eb3fe 100644
--- a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Ubuntu Default
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: ubuntu-26.04
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
index b725cc4c98..95944c2e20 100644
--- a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
+++ b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Windows Clang
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: windows-2025
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-default.yml b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
index 35940e1c94..a6c0735019 100644
--- a/.github/workflows/cpp-ci-serial-programs-windows-default.yml
+++ b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
@@ -1,13 +1,15 @@
 name: C++ CI Serial Programs Windows Default
 on:
   push:
+    branches: [main]
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [opened, synchronize, reopened, ready_for_review, edited]
 
 jobs:
   build:
-    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    if: github.event_name != 'pull_request' || 
+      (github.event.pull_request.draft == false && !(github.event.action == 'edited' && github.event.changes.base != null))
     uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
     with:
       os: windows-2025
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
index 6203e1223f..791cec65e9 100644
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
+++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
@@ -10,16 +10,12 @@ 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"
 */