diff --git a/.efrocachemap b/.efrocachemap
index 1672304c..453fbbe8 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -420,7 +420,7 @@
   "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/04/0a/c4f7d2794b018593ab0b2bcb07f0",
   "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/06/4d/18777c9a2eb2207a2891a2837a70",
   "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/81/90/23ab1ecc8c55267bd904a9c05344",
-  "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/81/f7/4b12684f8ef73fea97f90e4bd8ce",
+  "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/c4/97/a66312b606d32e0927631ea68cf2",
   "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/8b/fa/719ccefcd94822218fcedb9d5038",
   "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/c1/2b/54aeb92c709c4af443f4a9013b3d",
   "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/69/cc/f8bdd1e83162481c6bf2a78cb5e0",
@@ -434,7 +434,7 @@
   "assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/18/b2/9c1f6e3ca6e18d6a6fdbdb14e224",
   "assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/19/ba/b12493cfaa28d27f9bfee0459e20",
   "assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/93/31/66df9784a606600b7933bcb8ffa1",
-  "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/a4/2c/8c43b338be2367441b87378e19c1",
+  "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/51/31/64479524c0ee990b3e97ffdca068",
   "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/d5/19/5e450e35b83fe68722330d03b896",
   "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/87/2d/027aa239eb66ea8f496562f4fd83",
   "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a4/01/1fcc28b303858b3d028d26516907",
@@ -445,7 +445,7 @@
   "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/59/49/d75f2b9916541bd2be8c49a5171f",
   "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf",
   "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/38/0e/808588bf5140deae5107b61f1df7",
-  "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/25/d8/0ea1c9b292b17f1b288c3c3bf263",
+  "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/05/5b/910b8963f48cd494dc01d5a18a5c",
   "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/b7/0a/fab820b96e7aa587ee56427ecdc2",
   "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/67/7b/e4c6c03f889b6e1bcf39345fa197",
   "assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/50/9f/be006ba19be6a69a57837eb6dca0",
diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml
index 2205777f..460caedb 100644
--- a/.idea/dictionaries/ericf.xml
+++ b/.idea/dictionaries/ericf.xml
@@ -30,8 +30,8 @@
       <w>achname</w>
       <w>achs</w>
       <w>acinstance</w>
-      <w>ack'ed</w>
       <w>ack</w>
+      <w>ack'ed</w>
       <w>acked</w>
       <w>acks</w>
       <w>acnt</w>
@@ -153,8 +153,8 @@
       <w>bacommon</w>
       <w>badguy</w>
       <w>bafoundation</w>
-      <w>ballistica's</w>
       <w>ballistica</w>
+      <w>ballistica's</w>
       <w>ballisticacore</w>
       <w>ballisticacorecb</w>
       <w>bamaster</w>
@@ -810,8 +810,8 @@
       <w>gamedata</w>
       <w>gameinstance</w>
       <w>gamemap</w>
-      <w>gamepad's</w>
       <w>gamepad</w>
+      <w>gamepad's</w>
       <w>gamepadadvanced</w>
       <w>gamepads</w>
       <w>gamepadselect</w>
@@ -1200,8 +1200,8 @@
       <w>lsqlite</w>
       <w>lssl</w>
       <w>lstart</w>
-      <w>lstr's</w>
       <w>lstr</w>
+      <w>lstr's</w>
       <w>lstrs</w>
       <w>lsval</w>
       <w>ltex</w>
@@ -1837,8 +1837,8 @@
       <w>sessionname</w>
       <w>sessionplayer</w>
       <w>sessionplayers</w>
-      <w>sessionteam's</w>
       <w>sessionteam</w>
+      <w>sessionteam's</w>
       <w>sessionteams</w>
       <w>sessiontype</w>
       <w>setactivity</w>
@@ -2174,8 +2174,8 @@
       <w>txtw</w>
       <w>typeargs</w>
       <w>typecheck</w>
-      <w>typechecker's</w>
       <w>typechecker</w>
+      <w>typechecker's</w>
       <w>typedval</w>
       <w>typeshed</w>
       <w>typestr</w>
diff --git a/assets/src/ba_data/python/bastd/actor/scoreboard.py b/assets/src/ba_data/python/bastd/actor/scoreboard.py
index 7cce4253..54e13129 100644
--- a/assets/src/ba_data/python/bastd/actor/scoreboard.py
+++ b/assets/src/ba_data/python/bastd/actor/scoreboard.py
@@ -361,7 +361,7 @@ class Scoreboard:
                        flash: bool = True,
                        show_value: bool = True) -> None:
         """Update the score-board display for the given ba.Team."""
-        if not team.id in self._entries:
+        if team.id not in self._entries:
             self._add_team(team)
 
             # Create a proxy in the team which will kill
diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml
index a11b6ae5..1ae66f56 100644
--- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml
+++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml
@@ -13,8 +13,8 @@
       <w>ack'ed</w>
       <w>acked</w>
       <w>acks</w>
-      <w>aclass's</w>
       <w>aclass</w>
+      <w>aclass's</w>
       <w>activityplayer</w>
       <w>addrs</w>
       <w>adjoint</w>
@@ -149,8 +149,8 @@
       <w>cmath</w>
       <w>cmds</w>
       <w>cmdvals</w>
-      <w>codewarrior's</w>
       <w>codewarrior</w>
+      <w>codewarrior's</w>
       <w>cofnodes</w>
       <w>collapseable</w>
       <w>collidable</w>