diff --git a/.efrocachemap b/.efrocachemap
index 38dca9b6..89a6ee07 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -2584,7 +2584,7 @@
   "build/assets/ba_data/textures/zoeIconColorMask.pvr": "https://files.ballistica.net/cache/ba1/0a/8d/df4804e5754b784269a07c1ddf93",
   "build/assets/ba_data/textures/zoeIconColorMask_preview.png": "https://files.ballistica.net/cache/ba1/47/fd/459aad49c8af5d1e8bd778b863c3",
   "build/assets/ba_data/textures/zoeIcon_preview.png": "https://files.ballistica.net/cache/ba1/ff/85/bc6154691d91a10bd05eb6553988",
-  "build/assets/mac_disk_image/dmgbuild_settings.py": "https://files.ballistica.net/cache/ba1/52/80/5abc16af08f61367f56fa557b4a7",
+  "build/assets/mac_disk_image/dmgbuild_settings.py": "https://files.ballistica.net/cache/ba1/d0/31/7a0814b3d25351f6f681ec0f3baf",
   "build/assets/pylib-android/__future__.py": "https://files.ballistica.net/cache/ba1/e4/c1/8204c9a658ed7a66e73578e1aec3",
   "build/assets/pylib-android/__hello__.py": "https://files.ballistica.net/cache/ba1/22/0b/ed30fa72b96613d06c660d4383d0",
   "build/assets/pylib-android/_aix_support.py": "https://files.ballistica.net/cache/ba1/27/f4/57854d91066a4a0035edc1c74a29",
@@ -4080,18 +4080,18 @@
   "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/7b/c1/2dfb7c5fc6a31dd4ac4be9ef69bb",
   "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/af/9b/8de9876d0e3db5ccc49ce80c8e2a",
   "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/16/63/7bedf858ae0dc1e91acf76c1cbd6",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/15/69/0aed1da6e8988e46fd85e0b0b16c",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/76/d8/e2d3ae9228e1dd7b8fdbfcb676e0",
   "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/cc/d0/f0c1c32c948f5349e91071107d9a",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/16/d9/cb7a9fff79a562baf4729f5b44f3",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/2c/23125061df4f8d2c62bac5787979",
   "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fc/34/1623d3a8d0ff13a71f819300c091",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/2e/c6/4c618fc31c73ccef2e7d8d14ec7e",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/dd/8d/c73ee71bfd88d0af120ff17d551b",
   "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/84/38/e6f2c8c7607161c76e7c2d65ffd1",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/59/d0/a56cc7c46a195e874186aff2545f",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7b/ea/d4b485f9f702619046631f74fcc2",
   "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/08/dd/98f18c4d39850dafbf3efdfbc305",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0b/4e/c41ed0ba45b3db377a3f6fe2b591",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/54/51/221829a5b4814bb15c9fb7550e2d",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/b6/f5/289a7c3980b8b10785cf3e7a0c84",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f9/25/5a367595c2f116a5f4c5ff5badea",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bb/dc/546b55bf1e7cfa297dbc74f3b335",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/83/8a/bb8485797aae51bca7edcf62dc96",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/d1/2d/9850c8bc21b31c627386fa44c96a",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/b4/fb/efce666ea6a479f1310d9aa27300",
   "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/32/43c61f1e11520f764158cf0e76d2",
   "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/65/cba463f21a8f76c5bbfe27cae124",
   "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/73/20/119211f1700bb5a410cedf4e76f2",
@@ -4108,14 +4108,14 @@
   "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/90/9b/94f733c3a48691e02240e04dc792",
   "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/c7/873af48627997b6fab4b2c4ba6bc",
   "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/3a/94/4780fada10f0fc3f43a54f29c86f",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/09/9c/85764402b35843e1057494c867dd",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/38/22/b1ba8ab84ecedb8870fd7f122747",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/2a/10/a06ea64b81cc17db35bee9c037c3",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/85/b4/a1fcedeacc282d005fa2c052dcbb",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/0a/1a/de3dc9cd57640e657814826048be",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/dc/97/4f50384b1dbd7972c04278b5c52c",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/28/db/2894bb975eae0b909e78c33aacaa",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/7a/38/764a2c23aa26bf3ce1b549100fd2",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/e5/c9/1fafb53497e7d4ff19ecddc31d09",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/98/26/04e281a4cfa6a334abcb7e79dcbe",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/46/8b/eaee1191df159ad37a437429bbd9",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/82/fc/bbd1be0784b9d4ad46aa7da5dc24",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/c7/e7/a74ee82202fb7ae828f5066d1c79",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/f5/c3/eac894e0bfaacf4ec4740d54869d",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d1/9f/f5e35440c800af9f002c795a2814",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/ff/fc/b6ff2a5bf8c73e1a5fa987944548",
   "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
   "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
   "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/4e/07/87dd93e7ef29b8b78d0b4791d6f8",
diff --git a/.idea/ballisticakit.iml b/.idea/ballisticakit.iml
index e0bf8510..45327b93 100644
--- a/.idea/ballisticakit.iml
+++ b/.idea/ballisticakit.iml
@@ -34,6 +34,7 @@
       <excludeFolder url="file://$MODULE_DIR$/src/generated" />
       <excludeFolder url="file://$MODULE_DIR$/src/tools" />
       <excludeFolder url="file://$MODULE_DIR$/submodules" />
+      <excludeFolder url="file://$MODULE_DIR$/src/resources" />
       <excludePattern pattern=".assetcache" />
       <excludePattern pattern=".cache*" />
       <excludePattern pattern=".clang-format" />
@@ -73,4 +74,4 @@
   <component name="PyDocumentationSettings">
     <option name="analyzeDoctest" value="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml
index 7752a7dd..b9eb3330 100644
--- a/.idea/dictionaries/ericf.xml
+++ b/.idea/dictionaries/ericf.xml
@@ -67,6 +67,7 @@
       <w>alarmsound</w>
       <w>alibaba</w>
       <w>alibname</w>
+      <w>alldeps</w>
       <w>allerrors</w>
       <w>allobjc</w>
       <w>allobjs</w>
@@ -81,6 +82,7 @@
       <w>anamorphosis</w>
       <w>andr</w>
       <w>androidaddr</w>
+      <w>androideabi</w>
       <w>androidstudiocode</w>
       <w>anim</w>
       <w>animcurve</w>
@@ -100,6 +102,7 @@
       <w>apis</w>
       <w>apiversion</w>
       <w>apks</w>
+      <w>apntzcreds</w>
       <w>apost</w>
       <w>appath</w>
       <w>appathout</w>
@@ -110,10 +113,13 @@
       <w>appengine</w>
       <w>appiconset</w>
       <w>appid</w>
+      <w>appintentsmetadataprocessor</w>
       <w>appinvite</w>
       <w>appkit</w>
       <w>applescript</w>
       <w>appletv</w>
+      <w>appletvos</w>
+      <w>appletvsimulator</w>
       <w>appmode</w>
       <w>appname</w>
       <w>appnameupper</w>
@@ -125,10 +131,13 @@
       <w>apptimer</w>
       <w>apptimers</w>
       <w>apputils</w>
+      <w>archbase</w>
       <w>archivepath</w>
       <w>archivepathbase</w>
+      <w>archos</w>
       <w>archs</w>
       <w>argh</w>
+      <w>argindex</w>
       <w>argparse</w>
       <w>argsjoined</w>
       <w>argstr</w>
@@ -197,14 +206,18 @@
       <w>bacfg</w>
       <w>backgrounded</w>
       <w>backgrounding</w>
+      <w>backported</w>
       <w>backporting</w>
       <w>backwin</w>
       <w>baclassic</w>
       <w>bacloud</w>
       <w>bacloudcmd</w>
       <w>bacommon</w>
+      <w>bacoremeta</w>
       <w>badguy</w>
       <w>baenv</w>
+      <w>bafoobar</w>
+      <w>bafoobarmeta</w>
       <w>bafoundation</w>
       <w>bainternal</w>
       <w>ballistica</w>
@@ -217,15 +230,21 @@
       <w>bameta</w>
       <w>bametainternal</w>
       <w>baplus</w>
+      <w>baplusmeta</w>
       <w>barcolor</w>
       <w>barebones</w>
       <w>bargs</w>
       <w>bascenev</w>
       <w>baseaddr</w>
+      <w>basebasename</w>
       <w>baseh</w>
+      <w>baseheaders</w>
       <w>baseimps</w>
       <w>basemult</w>
+      <w>basenames</w>
+      <w>baseplatform</w>
       <w>basepos</w>
+      <w>basepylib</w>
       <w>baservnode</w>
       <w>basespaz</w>
       <w>basetime</w>
@@ -263,6 +282,7 @@
       <w>bgdynamics</w>
       <w>bgmodel</w>
       <w>bgrn</w>
+      <w>bgrp</w>
       <w>bgterrain</w>
       <w>bgtex</w>
       <w>bgthread</w>
@@ -270,7 +290,9 @@
       <w>binc</w>
       <w>bincfg</w>
       <w>bindcode</w>
+      <w>bindir</w>
       <w>bindvals</w>
+      <w>binpath</w>
       <w>bisectmodule</w>
       <w>bitcode</w>
       <w>blarg</w>
@@ -305,6 +327,8 @@
       <w>botspawnpts</w>
       <w>bottlenecked</w>
       <w>bottype</w>
+      <w>bpath</w>
+      <w>bpcolor</w>
       <w>bpos</w>
       <w>bpresult</w>
       <w>brandassets</w>
@@ -336,6 +360,11 @@
       <w>builddir</w>
       <w>buildfile</w>
       <w>buildfilename</w>
+      <w>buildfiles</w>
+      <w>buildline</w>
+      <w>buildlockname</w>
+      <w>buildlocks</w>
+      <w>buildmode</w>
       <w>buildnum</w>
       <w>buildserver</w>
       <w>buildtype</w>
@@ -351,6 +380,7 @@
       <w>cacert</w>
       <w>cachable</w>
       <w>cachebasename</w>
+      <w>cachedir</w>
       <w>cacheentry</w>
       <w>cachefile</w>
       <w>cachemap</w>
@@ -363,6 +393,7 @@
       <w>callargs</w>
       <w>callname</w>
       <w>callnode</w>
+      <w>callproc</w>
       <w>cameraflash</w>
       <w>camerashake</w>
       <w>campaignname</w>
@@ -371,6 +402,7 @@
       <w>caplog</w>
       <w>capturetheflag</w>
       <w>carentity</w>
+      <w>casefix</w>
       <w>cashregistersound</w>
       <w>cbegin</w>
       <w>cbgn</w>
@@ -383,13 +415,16 @@
       <w>ccind</w>
       <w>ccode</w>
       <w>ccompiler</w>
+      <w>cdirname</w>
       <w>cdrk</w>
       <w>cdull</w>
       <w>cdval</w>
       <w>cend</w>
       <w>centeuro</w>
       <w>centiseconds</w>
+      <w>certfile</w>
       <w>certifi</w>
+      <w>certpass</w>
       <w>cfconfig</w>
       <w>cfenv</w>
       <w>cfgdict</w>
@@ -399,6 +434,7 @@
       <w>cfgpath</w>
       <w>cfgs</w>
       <w>cfgui</w>
+      <w>cfield</w>
       <w>cflags</w>
       <w>cfuncs</w>
       <w>cgitb</w>
@@ -429,6 +465,7 @@
       <w>checktype</w>
       <w>childanntype</w>
       <w>childanntypes</w>
+      <w>childid</w>
       <w>childnode</w>
       <w>childtype</w>
       <w>childtypes</w>
@@ -439,6 +476,7 @@
       <w>chromebooks</w>
       <w>chunksize</w>
       <w>cjkcodecs</w>
+      <w>clangstatcache</w>
       <w>classline</w>
       <w>classmethod</w>
       <w>classmethods</w>
@@ -474,8 +512,11 @@
       <w>cmath</w>
       <w>cmathmodule</w>
       <w>cmds</w>
+      <w>cmdspath</w>
+      <w>cmdsraw</w>
       <w>cmembers</w>
       <w>cmodel</w>
+      <w>cmodule</w>
       <w>cmodules</w>
       <w>cmpf</w>
       <w>cmplen</w>
@@ -489,6 +530,7 @@
       <w>codeop</w>
       <w>collapsable</w>
       <w>collidemodel</w>
+      <w>collisionmesh</w>
       <w>colordiff</w>
       <w>colorpicker</w>
       <w>colorsys</w>
@@ -498,6 +540,7 @@
       <w>comms</w>
       <w>compat</w>
       <w>compileall</w>
+      <w>compilearch</w>
       <w>compileassetcatalog</w>
       <w>compilec</w>
       <w>compilelocations</w>
@@ -525,6 +568,7 @@
       <w>contextvarsmodule</w>
       <w>controlsguide</w>
       <w>conv</w>
+      <w>converticonsetfile</w>
       <w>convertlocationval</w>
       <w>cookiejar</w>
       <w>cooldown</w>
@@ -553,6 +597,8 @@
       <w>cpplintcodefull</w>
       <w>cpplintfull</w>
       <w>cpplintmodule</w>
+      <w>cpresource</w>
+      <w>cpresources</w>
       <w>cpuinfo</w>
       <w>cpus</w>
       <w>cpython</w>
@@ -563,6 +609,7 @@
       <w>creditslist</w>
       <w>credstr</w>
       <w>cresult</w>
+      <w>cruftpath</w>
       <w>cryptmodule</w>
       <w>cryptosimple</w>
       <w>cspbd</w>
@@ -582,6 +629,7 @@
       <w>curdir</w>
       <w>curhash</w>
       <w>curhashes</w>
+      <w>currenthash</w>
       <w>curstate</w>
       <w>curtime</w>
       <w>curtimestr</w>
@@ -624,6 +672,7 @@
       <w>deek</w>
       <w>defs</w>
       <w>defsline</w>
+      <w>defslines</w>
       <w>deivit</w>
       <w>depchecks</w>
       <w>depcls</w>
@@ -637,6 +686,7 @@
       <w>dereferencing</w>
       <w>deregistering</w>
       <w>deregistration</w>
+      <w>derq</w>
       <w>descpos</w>
       <w>desctype</w>
       <w>dest</w>
@@ -645,6 +695,7 @@
       <w>devicename</w>
       <w>devtool</w>
       <w>dffc</w>
+      <w>dfile</w>
       <w>dgram</w>
       <w>dhave</w>
       <w>dheadless</w>
@@ -677,10 +728,13 @@
       <w>dliwk</w>
       <w>dlldir</w>
       <w>dlls</w>
+      <w>dmacosx</w>
       <w>dmake</w>
       <w>dmgname</w>
       <w>dmitry</w>
       <w>dmodule</w>
+      <w>dmstatedir</w>
+      <w>dmstatepath</w>
       <w>dmypy</w>
       <w>dname</w>
       <w>dnames</w>
@@ -694,6 +748,7 @@
       <w>dofilter</w>
       <w>domreg</w>
       <w>domsg</w>
+      <w>doneclr</w>
       <w>dont</w>
       <w>doplay</w>
       <w>doraise</w>
@@ -719,7 +774,10 @@
       <w>dstattr</w>
       <w>dstbase</w>
       <w>dstdata</w>
+      <w>dstdir</w>
+      <w>dstdirfull</w>
       <w>dstdirname</w>
+      <w>dstent</w>
       <w>dstfile</w>
       <w>dstfin</w>
       <w>dstjson</w>
@@ -728,9 +786,13 @@
       <w>dstnode</w>
       <w>dstpath</w>
       <w>dstpathfull</w>
+      <w>dstrootsl</w>
       <w>dstrootvar</w>
       <w>dsts</w>
+      <w>dsttime</w>
+      <w>dsttimestr</w>
       <w>dstvar</w>
+      <w>dsymutil</w>
       <w>dtest</w>
       <w>dtime</w>
       <w>dualteamscore</w>
@@ -745,6 +807,7 @@
       <w>dummyval</w>
       <w>dumpminlog</w>
       <w>dups</w>
+      <w>dusing</w>
       <w>dval</w>
       <w>dxml</w>
       <w>dynload</w>
@@ -818,6 +881,7 @@
       <w>ericfroemling</w>
       <w>ericsson's</w>
       <w>errcount</w>
+      <w>errfile</w>
       <w>errname</w>
       <w>errno</w>
       <w>errored</w>
@@ -860,6 +924,8 @@
       <w>exportoptionspath</w>
       <w>exporttype</w>
       <w>exporttypestr</w>
+      <w>expsrc</w>
+      <w>extractappintentsmetadata</w>
       <w>extradata</w>
       <w>extraflagmat</w>
       <w>extrahash</w>
@@ -867,6 +933,7 @@
       <w>exts</w>
       <w>f'baseval</w>
       <w>f'chmod</w>
+      <w>f'dstbase</w>
       <w>f'final</w>
       <w>f'fixme</w>
       <w>factoryclass</w>
@@ -875,6 +942,7 @@
       <w>fakeshake</w>
       <w>fallbacks</w>
       <w>farthestpt</w>
+      <w>fatstdlib</w>
       <w>faulthandler</w>
       <w>fback</w>
       <w>fbase</w>
@@ -883,14 +951,19 @@
       <w>fcntl</w>
       <w>fcntlmodule</w>
       <w>fcode</w>
+      <w>fcodefin</w>
       <w>fcontents</w>
       <w>fcount</w>
       <w>fdata</w>
       <w>fdcount</w>
       <w>fdesc</w>
       <w>fdict</w>
+      <w>fdirs</w>
       <w>fdout</w>
       <w>featureset</w>
+      <w>featuresetdef</w>
+      <w>featuresets</w>
+      <w>featuresettest</w>
       <w>fecfc</w>
       <w>feedparser</w>
       <w>fentry</w>
@@ -930,6 +1003,7 @@
       <w>filterval</w>
       <w>finalhash</w>
       <w>finalmaterials</w>
+      <w>finalpath</w>
       <w>finfo</w>
       <w>firebase</w>
       <w>firestore</w>
@@ -937,6 +1011,7 @@
       <w>firstline</w>
       <w>firstpartykey</w>
       <w>flac</w>
+      <w>flagindex</w>
       <w>flagmat</w>
       <w>flagmaterial</w>
       <w>flagmats</w>
@@ -959,8 +1034,10 @@
       <w>fnmatch</w>
       <w>fnode</w>
       <w>fnum</w>
+      <w>fobjc</w>
       <w>foof</w>
       <w>foos</w>
+      <w>foov</w>
       <w>fooval</w>
       <w>fopen</w>
       <w>forcetype</w>
@@ -978,6 +1055,7 @@
       <w>fparts</w>
       <w>fpath</w>
       <w>fpathrel</w>
+      <w>fpaths</w>
       <w>fpathshort</w>
       <w>fprint</w>
       <w>fproject</w>
@@ -995,12 +1073,21 @@
       <w>froemling</w>
       <w>frombuffer</w>
       <w>fromini</w>
+      <w>fsarg</w>
+      <w>fsconfigpath</w>
       <w>fsdf</w>
+      <w>fset</w>
+      <w>fsetname</w>
+      <w>fsets</w>
       <w>fsettings</w>
+      <w>fsmetapackagename</w>
+      <w>fsname</w>
+      <w>fspackagename</w>
       <w>fsplit</w>
       <w>fsrc</w>
       <w>fstab</w>
       <w>fstat</w>
+      <w>fstestspackagename</w>
       <w>fstrs</w>
       <w>fsum</w>
       <w>ftime</w>
@@ -1056,8 +1143,10 @@
       <w>gearvr</w>
       <w>genchangelog</w>
       <w>gencmd</w>
+      <w>gencount</w>
       <w>gendocs</w>
       <w>gendummymodule</w>
+      <w>generatedsymfile</w>
       <w>genericpath</w>
       <w>genmapjson</w>
       <w>genstartercache</w>
@@ -1120,12 +1209,15 @@
       <w>ghnc</w>
       <w>gioacchino</w>
       <w>gitattributes</w>
+      <w>gitfiledir</w>
       <w>gitignore</w>
+      <w>gitignored</w>
       <w>gitignorelines</w>
       <w>gitignoreraw</w>
       <w>gitignores</w>
       <w>gitlog</w>
       <w>gitlogcore</w>
+      <w>gitpath</w>
       <w>globalns</w>
       <w>globalsnode</w>
       <w>gmake</w>
@@ -1142,6 +1234,7 @@
       <w>gpio</w>
       <w>gprev</w>
       <w>gpsui</w>
+      <w>gradians</w>
       <w>gradlepath</w>
       <w>gradlew</w>
       <w>graphlib</w>
@@ -1149,6 +1242,7 @@
       <w>grpentry</w>
       <w>grpkey</w>
       <w>grpmodule</w>
+      <w>grpname</w>
       <w>grps</w>
       <w>grpval</w>
       <w>grumbledorf</w>
@@ -1161,6 +1255,7 @@
       <w>handlemessage</w>
       <w>hant</w>
       <w>hashfilename</w>
+      <w>hashfiles</w>
       <w>hashlines</w>
       <w>hashobj</w>
       <w>hashopenssl</w>
@@ -1228,8 +1323,10 @@
       <w>iconutil</w>
       <w>ident</w>
       <w>idevices</w>
+      <w>ifdef</w>
       <w>ifeq</w>
       <w>ifneq</w>
+      <w>ignorevar</w>
       <w>iiarcade</w>
       <w>iiiiisssi</w>
       <w>iircade</w>
@@ -1249,6 +1346,7 @@
       <w>imgw</w>
       <w>importlines</w>
       <w>incentivized</w>
+      <w>includelines</w>
       <w>includetest</w>
       <w>incmd</w>
       <w>incr</w>
@@ -1274,6 +1372,7 @@
       <w>initialplayerinfos</w>
       <w>initing</w>
       <w>inits</w>
+      <w>inittab</w>
       <w>inmobi</w>
       <w>inpath</w>
       <w>inpaths</w>
@@ -1304,6 +1403,7 @@
       <w>ioprepping</w>
       <w>ioreg</w>
       <w>ipaddress</w>
+      <w>iphonesimulator</w>
       <w>ipos</w>
       <w>iprof</w>
       <w>isatty</w>
@@ -1399,6 +1499,7 @@
       <w>lbval</w>
       <w>lbzip</w>
       <w>lcfg</w>
+      <w>lchmod</w>
       <w>lcolor</w>
       <w>lcrypto</w>
       <w>ldpi</w>
@@ -1413,8 +1514,10 @@
       <w>levelno</w>
       <w>levelnos</w>
       <w>levelstr</w>
+      <w>lffi</w>
       <w>lfull</w>
       <w>lfval</w>
+      <w>libballistica</w>
       <w>libballisticakit</w>
       <w>libbz</w>
       <w>libbzip</w>
@@ -1447,6 +1550,7 @@
       <w>lindex</w>
       <w>lindexorig</w>
       <w>linearstep</w>
+      <w>linebegin</w>
       <w>linebits</w>
       <w>lineheight</w>
       <w>linemax</w>
@@ -1512,6 +1616,7 @@
       <w>lsbo</w>
       <w>lsbt</w>
       <w>lshort</w>
+      <w>lsplits</w>
       <w>lsprof</w>
       <w>lsqlite</w>
       <w>lsregister</w>
@@ -1547,6 +1652,8 @@
       <w>malhotra</w>
       <w>mallimportedby</w>
       <w>mandir</w>
+      <w>manfile</w>
+      <w>manprivpath</w>
       <w>mantype</w>
       <w>manualtab</w>
       <w>mapdata</w>
@@ -1567,7 +1674,9 @@
       <w>mathnode</w>
       <w>mathutils</w>
       <w>maxdepth</w>
+      <w>maxlines</w>
       <w>maxlinks</w>
+      <w>maxparts</w>
       <w>maxpathlen</w>
       <w>maxtries</w>
       <w>maxval</w>
@@ -1624,6 +1733,7 @@
       <w>mmapmodule</w>
       <w>mmult</w>
       <w>mname</w>
+      <w>mnames</w>
       <w>mnode</w>
       <w>mnpp</w>
       <w>modder</w>
@@ -1632,6 +1742,8 @@
       <w>modestr</w>
       <w>modeval</w>
       <w>modpack</w>
+      <w>modstr</w>
+      <w>modtime</w>
       <w>modtimes</w>
       <w>moduledir</w>
       <w>modulefinder</w>
@@ -1640,6 +1752,7 @@
       <w>modutils</w>
       <w>moola</w>
       <w>mopaque</w>
+      <w>morecnt</w>
       <w>moreso</w>
       <w>mpath</w>
       <w>mrmaxmeier</w>
@@ -1710,7 +1823,9 @@
       <w>mywidget</w>
       <w>namecap</w>
       <w>namedarg</w>
+      <w>namel</w>
       <w>nametext</w>
+      <w>nameu</w>
       <w>nameval</w>
       <w>nboxes</w>
       <w>nbuffer</w>
@@ -1735,6 +1850,8 @@
       <w>newnode</w>
       <w>newpath</w>
       <w>newtoken</w>
+      <w>newuuid</w>
+      <w>newuuids</w>
       <w>nextcall</w>
       <w>nextfilenum</w>
       <w>nextlevel</w>
@@ -1794,6 +1911,7 @@
       <w>objcount</w>
       <w>objid</w>
       <w>objname</w>
+      <w>objpath</w>
       <w>objs</w>
       <w>objset</w>
       <w>objsizes</w>
@@ -1819,7 +1937,10 @@
       <w>oldbook</w>
       <w>olde</w>
       <w>oldlady</w>
+      <w>oldpath</w>
       <w>oldtoken</w>
+      <w>olduuid</w>
+      <w>olduuids</w>
       <w>onln</w>
       <w>onscreencountdown</w>
       <w>onscreenkeyboard</w>
@@ -1852,9 +1973,11 @@
       <w>outdata</w>
       <w>outdelay</w>
       <w>outdict</w>
+      <w>outdir</w>
       <w>outext</w>
       <w>outfilename</w>
       <w>outfilepath</w>
+      <w>outfiles</w>
       <w>outhashpath</w>
       <w>outmsg</w>
       <w>outname</w>
@@ -1879,6 +2002,7 @@
       <w>pandoc</w>
       <w>pandroid</w>
       <w>parallelized</w>
+      <w>parentpath</w>
       <w>parsermodule</w>
       <w>parsetok</w>
       <w>partyqueue</w>
@@ -1886,21 +2010,27 @@
       <w>passnode</w>
       <w>passthrough</w>
       <w>passwd</w>
+      <w>patchpaths</w>
       <w>patcomp</w>
+      <w>pathbar</w>
       <w>pathcapture</w>
       <w>pathdst</w>
       <w>pathlib</w>
       <w>pathlist</w>
       <w>pathnames</w>
       <w>pathparts</w>
+      <w>pathsegs</w>
       <w>pathsrc</w>
       <w>pathstonames</w>
       <w>pathtmp</w>
       <w>pathwonky</w>
       <w>patsubst</w>
       <w>pausable</w>
+      <w>pbasename</w>
       <w>pbrowser</w>
       <w>pbtn</w>
+      <w>pbxgrp</w>
+      <w>pbxgrps</w>
       <w>pbxproj</w>
       <w>pcall</w>
       <w>pchild</w>
@@ -1917,6 +2047,7 @@
       <w>perma</w>
       <w>perrdetail</w>
       <w>phandle</w>
+      <w>phasename</w>
       <w>phasers</w>
       <w>phasescriptexecution</w>
       <w>phello</w>
@@ -1929,6 +2060,7 @@
       <w>pipname</w>
       <w>pipvers</w>
       <w>pkey</w>
+      <w>pkgdir</w>
       <w>pkgutil</w>
       <w>platstr</w>
       <w>playercast</w>
@@ -1967,6 +2099,8 @@
       <w>plvel</w>
       <w>pmats</w>
       <w>pname</w>
+      <w>pnamel</w>
+      <w>pnameu</w>
       <w>pngs</w>
       <w>pnode</w>
       <w>podcasts</w>
@@ -1982,6 +2116,7 @@
       <w>popuptext</w>
       <w>positionadjusted</w>
       <w>posixpath</w>
+      <w>posixshmem</w>
       <w>posixsubprocess</w>
       <w>posonlyargs</w>
       <w>postinit</w>
@@ -2008,7 +2143,9 @@
       <w>precommand</w>
       <w>precompiling</w>
       <w>preconfig</w>
+      <w>predeclare</w>
       <w>predeclares</w>
+      <w>predecs</w>
       <w>preexec</w>
       <w>prefablib</w>
       <w>preflightfast</w>
@@ -2022,6 +2159,7 @@
       <w>premult</w>
       <w>premultiplied</w>
       <w>premultiply</w>
+      <w>prepass</w>
       <w>prepdata</w>
       <w>preprocessing</w>
       <w>prereq</w>
@@ -2046,6 +2184,8 @@
       <w>processinfoplistfile</w>
       <w>processpch</w>
       <w>processpchplusplus</w>
+      <w>processproductpackaging</w>
+      <w>processproductpackagingder</w>
       <w>procs</w>
       <w>profileindex</w>
       <w>profilekey</w>
@@ -2055,12 +2195,16 @@
       <w>projbasename</w>
       <w>projconfig</w>
       <w>projdir</w>
+      <w>projectconfig</w>
       <w>projectpath</w>
       <w>projectroot</w>
+      <w>projname</w>
       <w>projpath</w>
       <w>projprefix</w>
       <w>projroot</w>
       <w>projs</w>
+      <w>projsrc</w>
+      <w>projtxt</w>
       <w>promocode</w>
       <w>proxykey</w>
       <w>prtb</w>
@@ -2089,6 +2233,7 @@
       <w>punchmats</w>
       <w>punchpos</w>
       <w>punchsound</w>
+      <w>pupdatedata</w>
       <w>pupgrade</w>
       <w>purply</w>
       <w>pushcall</w>
@@ -2118,6 +2263,7 @@
       <w>pybuild</w>
       <w>pybuildapple</w>
       <w>pycache</w>
+      <w>pycfgpath</w>
       <w>pycharm's</w>
       <w>pycharmbin</w>
       <w>pycharmfull</w>
@@ -2146,6 +2292,7 @@
       <w>pylintscripts</w>
       <w>pylintscriptsfast</w>
       <w>pylintscriptsfull</w>
+      <w>pymodulenames</w>
       <w>pyobjc</w>
       <w>pyoffs</w>
       <w>pypaths</w>
@@ -2215,6 +2362,7 @@
       <w>reqs</w>
       <w>reqtype</w>
       <w>reqtypes</w>
+      <w>requireable</w>
       <w>resample</w>
       <w>resetbtn</w>
       <w>resetinput</w>
@@ -2264,6 +2412,8 @@
       <w>rspobj</w>
       <w>rsptypes</w>
       <w>rstr</w>
+      <w>rsync's</w>
+      <w>rsyncver</w>
       <w>rtest</w>
       <w>rtnetlink</w>
       <w>rtxt</w>
@@ -2319,6 +2469,7 @@
       <w>scproxy</w>
       <w>screenmessage</w>
       <w>scriptdirs</w>
+      <w>scriptdst</w>
       <w>scriptfiles</w>
       <w>scriptsdir</w>
       <w>scrlw</w>
@@ -2401,10 +2552,13 @@
       <w>showsubseconds</w>
       <w>shroom</w>
       <w>shutil</w>
+      <w>signingconfig</w>
+      <w>signingconfigname</w>
       <w>sigsetjmp</w>
       <w>simplesubclasses</w>
       <w>simpletype</w>
       <w>sincelaunch</w>
+      <w>sincestr</w>
       <w>singledispatch</w>
       <w>singledispatchmethod</w>
       <w>sirplus</w>
@@ -2430,6 +2584,7 @@
       <w>socketmodule</w>
       <w>socketserver</w>
       <w>softdefault</w>
+      <w>softreq</w>
       <w>somevar</w>
       <w>sortname</w>
       <w>soundtrackname</w>
@@ -2460,18 +2615,22 @@
       <w>specialchar</w>
       <w>specialoffer</w>
       <w>spinoff</w>
+      <w>spinoff's</w>
+      <w>spinoffconfig</w>
       <w>spinoffdata</w>
       <w>spinoffs</w>
       <w>spinup</w>
       <w>splayer</w>
       <w>splitlen</w>
       <w>splitnumstr</w>
+      <w>spwd</w>
       <w>squadcore</w>
       <w>srcabs</w>
       <w>srcattr</w>
       <w>srcdata</w>
       <w>srcdir</w>
       <w>srcfolder</w>
+      <w>srcgrp</w>
       <w>srcid</w>
       <w>srcjson</w>
       <w>srcname</w>
@@ -2483,6 +2642,8 @@
       <w>srcpy</w>
       <w>srcpydata</w>
       <w>srcstr</w>
+      <w>srctime</w>
+      <w>srctimestr</w>
       <w>srctxt</w>
       <w>sred</w>
       <w>sshd</w>
@@ -2515,6 +2676,7 @@
       <w>stdspaz</w>
       <w>stedit</w>
       <w>steelseries</w>
+      <w>stgdict</w>
       <w>stickman</w>
       <w>storable</w>
       <w>storagename</w>
@@ -2548,6 +2710,7 @@
       <w>subdirs</w>
       <w>subfieldpath</w>
       <w>subfolders</w>
+      <w>submpath</w>
       <w>subname</w>
       <w>subpath</w>
       <w>subpaths</w>
@@ -2574,6 +2737,12 @@
       <w>swht</w>
       <w>swidth</w>
       <w>swiftc</w>
+      <w>swiftcompile</w>
+      <w>swiftdriver</w>
+      <w>swiftdriverjobdiscovery</w>
+      <w>swiftemitmodule</w>
+      <w>swiftgeneratepch</w>
+      <w>swiftmergegeneratedheaders</w>
       <w>swip</w>
       <w>swipsound</w>
       <w>sylw</w>
@@ -2652,6 +2821,7 @@
       <w>testcapi</w>
       <w>testcapimodule</w>
       <w>testclass</w>
+      <w>testclinic</w>
       <w>testconsole</w>
       <w>testd</w>
       <w>testdl</w>
@@ -2676,6 +2846,7 @@
       <w>testsoundtrack</w>
       <w>testtask</w>
       <w>testthread</w>
+      <w>testtype</w>
       <w>testval</w>
       <w>testwith</w>
       <w>texcoords</w>
@@ -2695,6 +2866,8 @@
       <w>this'll</w>
       <w>thislinelen</w>
       <w>thismodule</w>
+      <w>thisname</w>
+      <w>thispath</w>
       <w>threadlocals</w>
       <w>threadpool</w>
       <w>threadtype</w>
@@ -2711,6 +2884,7 @@
       <w>timestring</w>
       <w>timestrval</w>
       <w>timetype</w>
+      <w>timevalfin</w>
       <w>tipstext</w>
       <w>titletext</w>
       <w>tkinval</w>
@@ -2724,6 +2898,7 @@
       <w>tnode</w>
       <w>tntspawner</w>
       <w>tntspawnpos</w>
+      <w>tomllib</w>
       <w>toolconfigs</w>
       <w>toolconfigsrc</w>
       <w>toolsdir</w>
@@ -2731,6 +2906,7 @@
       <w>topkilledcount</w>
       <w>toplevel</w>
       <w>toplevelfiles</w>
+      <w>toplevelname</w>
       <w>totaldudes</w>
       <w>totalobjmb</w>
       <w>totalobjsize</w>
@@ -2743,6 +2919,8 @@
       <w>tournamententry</w>
       <w>tournamentscores</w>
       <w>tpartial</w>
+      <w>tpath</w>
+      <w>tpathsegs</w>
       <w>tpexl</w>
       <w>tpimport</w>
       <w>tpimportex</w>
@@ -2781,6 +2959,7 @@
       <w>tvalue</w>
       <w>tvos</w>
       <w>twidth</w>
+      <w>tword</w>
       <w>twrths</w>
       <w>txtactor</w>
       <w>txtl</w>
@@ -2797,6 +2976,7 @@
       <w>typeshed</w>
       <w>typestr</w>
       <w>tzdiff</w>
+      <w>tzinfo</w>
       <w>tzinfos</w>
       <w>tzoffset</w>
       <w>tzpath</w>
@@ -2863,6 +3043,7 @@
       <w>usid</w>
       <w>utcnow</w>
       <w>utimensat</w>
+      <w>uuidentry</w>
       <w>uuidmodule</w>
       <w>uval</w>
       <w>valanntype</w>
@@ -2915,6 +3096,7 @@
       <w>waaah</w>
       <w>waittime</w>
       <w>wanttype</w>
+      <w>warnstr</w>
       <w>warntype</w>
       <w>wasdead</w>
       <w>wasn</w>
@@ -2985,9 +3167,12 @@
       <w>xcarchive</w>
       <w>xcassets</w>
       <w>xcframework</w>
+      <w>xcft</w>
+      <w>xcode's</w>
       <w>xcodebuild</w>
       <w>xcodebuildverbose</w>
       <w>xcoderun</w>
+      <w>xcodesortkey</w>
       <w>xcpretty</w>
       <w>xcprojpath</w>
       <w>xcrun</w>
diff --git a/.idea/inspectionProfiles/Default.xml b/.idea/inspectionProfiles/Default.xml
index 4e8b4a5b..ff8542f6 100644
--- a/.idea/inspectionProfiles/Default.xml
+++ b/.idea/inspectionProfiles/Default.xml
@@ -112,6 +112,7 @@
           <option value="type.__getitem__" />
           <option value="typing_extensions.assert_type" />
           <option value="float.__getitem__" />
+          <option value="pbxproj.pbxsections.PBXGroup.PBXGroup.children" />
         </list>
       </option>
     </inspection_tool>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b92c6806..3d7bf9c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,7 +105,7 @@
   revamped these in 1.5, and, after working with them for a few years, I feel
   that having a single time(), timer(), and Timer() call with a variety of
   arguments influencing behavior is unwieldy, so I'll be splitting things out
-  into a few seperate and simplified versions. Details follow.
+  into a few separate and simplified versions. Details follow.
 - There is now the concept of 'app-time'. This was previously called '
   real-time'. It is basically time that has elapsed while the app is actively
   running. It never jumps ahead or goes backwards and it stops progressing while
@@ -168,7 +168,7 @@
   basically using the new 'display-time' concept). The engine should now be
   better at maintaining smooth looking animation at other frame-rates. Please
   holler if you see otherwise. Note this doesn't affect the issue where pure SDL
-  builds like PC/Linux are locked to 60fps; that's a seperate thing.
+  builds like PC/Linux are locked to 60fps; that's a separate thing.
 - You can set env-var `BA_DEBUG_LOG_DISPLAY_TIME=1` to get display-time stat
   logs to make sure things are working smoothly on your setup.
 - The engine no longer requires that ba_data and other required files exist in
@@ -185,7 +185,7 @@
 - The `-exec` command-line arg has been renamed to be either `--exec` or `-e`.
 - Added a command arg accessible via `--command` or `-c`. Unlike the exec arg
   which runs as part of the app event loop, this command runs *instead* of the
-  normal event loop. It can be thought of as analagous to the `-c` arg for the
+  normal event loop. It can be thought of as analogous to the `-c` arg for the
   Python interpreter. This provides a clean way to do things like introspect
   ballistica's binary modules without having to worry about data files being
   present or about exiting the app after the command runs. The app simply
@@ -201,7 +201,7 @@
   ba.app.run()'`.
 - Related to the above, it is now possible for `ba.app.python_directory_app`,
   `ba.app.python_directory_user`, and `ba.app.python_directory_app_site` to be
-  None if ballisticia is being run in a non-standard environment setup. Just
+  None if ballistica is being run in a non-standard environment setup. Just
   something to watch out for.
 - The `ba` module is no longer imported by default. Since most modding will go
   through other modules now such as `bascenev` or `bauiv1` it seemed odd to be
@@ -1559,7 +1559,7 @@
 ### 1.4.100 (14264)
 
 - added a 'playlistCode' option in the server config which corresponds with
-  playlist codes added in Ballisticakit 1.4.100 (used for sharing playlists with
+  playlist codes added in BombSquad 1.4.100 (used for sharing playlists with
   friends). Now you can create a custom playlist, grab a code for it, and easily
   use it in a dedicated server.
 
diff --git a/ballisticakit-cmake/.idea/dictionaries/ericf.xml b/ballisticakit-cmake/.idea/dictionaries/ericf.xml
index b911946b..e61ef3f1 100644
--- a/ballisticakit-cmake/.idea/dictionaries/ericf.xml
+++ b/ballisticakit-cmake/.idea/dictionaries/ericf.xml
@@ -44,6 +44,7 @@
       <w>alext</w>
       <w>alibaba</w>
       <w>alibname</w>
+      <w>alldeps</w>
       <w>allerrors</w>
       <w>allobjc</w>
       <w>allobjs</w>
@@ -56,6 +57,7 @@
       <w>alsa</w>
       <w>alsoft</w>
       <w>anchorx</w>
+      <w>androideabi</w>
       <w>animcurve</w>
       <w>aniso</w>
       <w>annarg</w>
@@ -69,9 +71,13 @@
       <w>aparsed</w>
       <w>apientry</w>
       <w>apiversion</w>
+      <w>apntzcreds</w>
       <w>apost</w>
       <w>appcomponent</w>
       <w>appconfig</w>
+      <w>appintentsmetadataprocessor</w>
+      <w>appletvos</w>
+      <w>appletvsimulator</w>
       <w>appmode</w>
       <w>appname</w>
       <w>appnameupper</w>
@@ -81,6 +87,9 @@
       <w>apptime</w>
       <w>apptimer</w>
       <w>apptimers</w>
+      <w>archbase</w>
+      <w>archos</w>
+      <w>argindex</w>
       <w>argsjoined</w>
       <w>argstr</w>
       <w>armcap</w>
@@ -106,11 +115,15 @@
       <w>babasemeta</w>
       <w>backgrounded</w>
       <w>backgrounding</w>
+      <w>backported</w>
       <w>backporting</w>
       <w>backtraces</w>
       <w>backwin</w>
       <w>baclassic</w>
+      <w>bacoremeta</w>
       <w>baenv</w>
+      <w>bafoobar</w>
+      <w>bafoobarmeta</w>
       <w>bainternal</w>
       <w>ballistica</w>
       <w>ballistica's</w>
@@ -120,11 +133,17 @@
       <w>bameta</w>
       <w>bametainternal</w>
       <w>baplus</w>
+      <w>baplusmeta</w>
       <w>barebones</w>
       <w>bargs</w>
       <w>bascenev</w>
       <w>baseaddr</w>
+      <w>basebasename</w>
+      <w>baseheaders</w>
       <w>baseimps</w>
+      <w>basenames</w>
+      <w>baseplatform</w>
+      <w>basepylib</w>
       <w>basetime</w>
       <w>basetimer</w>
       <w>basetype</w>
@@ -150,10 +169,13 @@
       <w>bezanson</w>
       <w>bgdynamics</w>
       <w>bgra</w>
+      <w>bgrp</w>
       <w>bigendian</w>
       <w>bilinear</w>
       <w>bindcode</w>
+      <w>bindir</w>
       <w>bindvals</w>
+      <w>binpath</w>
       <w>binpow</w>
       <w>bitcount</w>
       <w>bitdepth</w>
@@ -187,6 +209,8 @@
       <w>bootstrappy</w>
       <w>bootsubprocess</w>
       <w>bouyancy</w>
+      <w>bpath</w>
+      <w>bpcolor</w>
       <w>bppv</w>
       <w>bpresult</w>
       <w>bresult</w>
@@ -208,6 +232,11 @@
       <w>bucketnum</w>
       <w>bufs</w>
       <w>buildconfig</w>
+      <w>buildfiles</w>
+      <w>buildline</w>
+      <w>buildlockname</w>
+      <w>buildlocks</w>
+      <w>buildmode</w>
       <w>buildnumber</w>
       <w>buttondown</w>
       <w>buttonmouse</w>
@@ -215,6 +244,7 @@
       <w>buttonwidget</w>
       <w>bwst</w>
       <w>cacert</w>
+      <w>cachedir</w>
       <w>cadata</w>
       <w>cafile</w>
       <w>calced</w>
@@ -223,6 +253,7 @@
       <w>caled</w>
       <w>callargs</w>
       <w>callbackobj</w>
+      <w>callproc</w>
       <w>camalign</w>
       <w>camelback</w>
       <w>camerashake</w>
@@ -230,6 +261,7 @@
       <w>capitan</w>
       <w>caplog</w>
       <w>cargs</w>
+      <w>casefix</w>
       <w>cbegin</w>
       <w>cbgn</w>
       <w>cbresults</w>
@@ -238,12 +270,16 @@
       <w>ccind</w>
       <w>ccontext</w>
       <w>ccylinder</w>
+      <w>cdirname</w>
       <w>cend</w>
       <w>centiseconds</w>
+      <w>certfile</w>
       <w>certifi</w>
+      <w>certpass</w>
       <w>cfgdict</w>
       <w>cfgdir</w>
       <w>cfgpath</w>
+      <w>cfield</w>
       <w>changeme</w>
       <w>charn</w>
       <w>charnum</w>
@@ -256,12 +292,14 @@
       <w>checksummed</w>
       <w>childanntype</w>
       <w>childanntypes</w>
+      <w>childid</w>
       <w>childtype</w>
       <w>childtypes</w>
       <w>childval</w>
       <w>chrono</w>
       <w>chunksize</w>
       <w>cjief</w>
+      <w>clangstatcache</w>
       <w>classdict</w>
       <w>classline</w>
       <w>cleanupcheck</w>
@@ -274,7 +312,10 @@
       <w>cmakelist</w>
       <w>cmath</w>
       <w>cmds</w>
+      <w>cmdspath</w>
+      <w>cmdsraw</w>
       <w>cmdvals</w>
+      <w>cmodule</w>
       <w>cmodules</w>
       <w>cmplen</w>
       <w>codedata</w>
@@ -284,8 +325,10 @@
       <w>collapseable</w>
       <w>collidable</w>
       <w>collider</w>
+      <w>collisionmesh</w>
       <w>columnwidget</w>
       <w>comms</w>
+      <w>compilearch</w>
       <w>compileassetcatalog</w>
       <w>compilec</w>
       <w>compilemetalfile</w>
@@ -295,6 +338,7 @@
       <w>connectattr</w>
       <w>containerwidget</w>
       <w>controlfp</w>
+      <w>converticonsetfile</w>
       <w>cooldown</w>
       <w>coopscore</w>
       <w>copypng</w>
@@ -306,6 +350,8 @@
       <w>cout</w>
       <w>cpel</w>
       <w>cpplint</w>
+      <w>cpresource</w>
+      <w>cpresources</w>
       <w>cptr</w>
       <w>cpuid</w>
       <w>crashenv</w>
@@ -316,6 +362,7 @@
       <w>cresult</w>
       <w>crom</w>
       <w>crosswire</w>
+      <w>cruftpath</w>
       <w>crvel</w>
       <w>cryptosimple</w>
       <w>csize</w>
@@ -329,6 +376,7 @@
       <w>ctargetref</w>
       <w>ctracker</w>
       <w>cubemap</w>
+      <w>currenthash</w>
       <w>curtime</w>
       <w>curv</w>
       <w>cutef</w>
@@ -359,6 +407,7 @@
       <w>deallocation</w>
       <w>debugger's</w>
       <w>deek</w>
+      <w>defslines</w>
       <w>deinit</w>
       <w>deltaval</w>
       <w>demangle</w>
@@ -370,6 +419,7 @@
       <w>deregistering</w>
       <w>deregistration</w>
       <w>dernit</w>
+      <w>derq</w>
       <w>desctype</w>
       <w>destdir</w>
       <w>dets</w>
@@ -377,6 +427,7 @@
       <w>dfba</w>
       <w>dffc</w>
       <w>dfff</w>
+      <w>dfile</w>
       <w>dfmt</w>
       <w>dictval</w>
       <w>didn</w>
@@ -390,11 +441,15 @@
       <w>dlife</w>
       <w>dliwk</w>
       <w>dllpath</w>
+      <w>dmacosx</w>
       <w>dmake</w>
       <w>dmgname</w>
+      <w>dmstatedir</w>
+      <w>dmstatepath</w>
       <w>dname</w>
       <w>dncm</w>
       <w>dobell</w>
+      <w>doneclr</w>
       <w>doneptr</w>
       <w>doraise</w>
       <w>dosomething</w>
@@ -410,15 +465,24 @@
       <w>dsound</w>
       <w>dstabs</w>
       <w>dstattr</w>
+      <w>dstbase</w>
+      <w>dstdir</w>
+      <w>dstdirfull</w>
+      <w>dstent</w>
       <w>dstnode</w>
       <w>dstpath</w>
       <w>dstr</w>
+      <w>dstrootsl</w>
+      <w>dsttime</w>
+      <w>dsttimestr</w>
+      <w>dsymutil</w>
       <w>dtest</w>
       <w>dummymodules</w>
       <w>dummyret</w>
       <w>dummyval</w>
       <w>dummyvalid</w>
       <w>dumpminlog</w>
+      <w>dusing</w>
       <w>dval</w>
       <w>dxgi</w>
       <w>dynamicdata</w>
@@ -456,6 +520,7 @@
       <w>ericf</w>
       <w>ericsson</w>
       <w>ericsson's</w>
+      <w>errfile</w>
       <w>errname</w>
       <w>erroring</w>
       <w>escval</w>
@@ -479,10 +544,13 @@
       <w>expl</w>
       <w>exportlist</w>
       <w>exporttypestr</w>
+      <w>expsrc</w>
+      <w>extractappintentsmetadata</w>
       <w>extradata</w>
       <w>extrahash</w>
       <w>extrascale</w>
       <w>exts</w>
+      <w>f'dstbase</w>
       <w>facepts</w>
       <w>fairydust</w>
       <w>fakeshake</w>
@@ -491,15 +559,21 @@
       <w>fastldlt</w>
       <w>fastlsolve</w>
       <w>fastltsolve</w>
+      <w>fatstdlib</w>
       <w>faulthandler</w>
       <w>fbos</w>
       <w>fcntl</w>
+      <w>fcodefin</w>
       <w>fdata</w>
       <w>fdcount</w>
+      <w>fdirs</w>
       <w>fdirx</w>
       <w>fdiry</w>
       <w>fdirz</w>
       <w>featureset</w>
+      <w>featuresetdef</w>
+      <w>featuresets</w>
+      <w>featuresettest</w>
       <w>fentry</w>
       <w>fenv</w>
       <w>fesetround</w>
@@ -519,10 +593,12 @@
       <w>filterdoc</w>
       <w>filterstr</w>
       <w>filterval</w>
+      <w>finalpath</w>
       <w>finishedptr</w>
       <w>firstpartykey</w>
       <w>fjco</w>
       <w>fjcoiwef</w>
+      <w>flagindex</w>
       <w>flipbit</w>
       <w>floinkdingle</w>
       <w>floooff</w>
@@ -532,13 +608,16 @@
       <w>fname</w>
       <w>fnode</w>
       <w>fnumc</w>
+      <w>fobjc</w>
       <w>focuswindow</w>
+      <w>foov</w>
       <w>fopen</w>
       <w>fourcc</w>
       <w>fovs</w>
       <w>fovx</w>
       <w>fovy</w>
       <w>fpath</w>
+      <w>fpaths</w>
       <w>framebuffers</w>
       <w>framedef</w>
       <w>frameldefs</w>
@@ -552,6 +631,15 @@
       <w>fromini</w>
       <w>frompos</w>
       <w>frontmost</w>
+      <w>fsarg</w>
+      <w>fsconfigpath</w>
+      <w>fset</w>
+      <w>fsetname</w>
+      <w>fsets</w>
+      <w>fsmetapackagename</w>
+      <w>fsname</w>
+      <w>fspackagename</w>
+      <w>fstestspackagename</w>
       <w>fsum</w>
       <w>ftos</w>
       <w>ftou</w>
@@ -576,6 +664,8 @@
       <w>gearvr</w>
       <w>genchangelog</w>
       <w>gencmd</w>
+      <w>gencount</w>
+      <w>generatedsymfile</w>
       <w>getactivity</w>
       <w>getattro</w>
       <w>getattrofunc</w>
@@ -621,6 +711,9 @@
       <w>gettime</w>
       <w>gettotalrefcount</w>
       <w>getuisound</w>
+      <w>gitfiledir</w>
+      <w>gitignored</w>
+      <w>gitpath</w>
       <w>gles</w>
       <w>glext</w>
       <w>globalns</w>
@@ -628,9 +721,11 @@
       <w>googleplaytab</w>
       <w>gpgs</w>
       <w>gqualstr</w>
+      <w>gradians</w>
       <w>graphlib</w>
       <w>grav</w>
       <w>grisha</w>
+      <w>grpname</w>
       <w>gstate</w>
       <w>gthm</w>
       <w>guiddef</w>
@@ -641,6 +736,7 @@
       <w>halign</w>
       <w>handfull</w>
       <w>handlemessage</w>
+      <w>hashfiles</w>
       <w>hastouchscreen</w>
       <w>hatmotion</w>
       <w>haveint</w>
@@ -679,6 +775,8 @@
       <w>ifaddr</w>
       <w>ifaddrs</w>
       <w>ifdebug</w>
+      <w>ifdef</w>
+      <w>ignorevar</w>
       <w>iiiiisss</w>
       <w>iiiiisssi</w>
       <w>iircade</w>
@@ -688,6 +786,7 @@
       <w>imayushsaini</w>
       <w>importlines</w>
       <w>incentivized</w>
+      <w>includelines</w>
       <w>indata</w>
       <w>inet</w>
       <w>infoset</w>
@@ -712,6 +811,7 @@
       <w>ioprepped</w>
       <w>ioprepping</w>
       <w>ioreg</w>
+      <w>iphonesimulator</w>
       <w>iscoroutinefunction</w>
       <w>iserverget</w>
       <w>iserverput</w>
@@ -771,14 +871,17 @@
       <w>lastline</w>
       <w>lastvalid</w>
       <w>lbzip</w>
+      <w>lchmod</w>
       <w>leaderboard</w>
       <w>leaderboards</w>
       <w>lenval</w>
       <w>levelno</w>
       <w>levelnos</w>
       <w>levelstr</w>
+      <w>lffi</w>
       <w>lgui</w>
       <w>lhalf</w>
+      <w>libballistica</w>
       <w>libbz</w>
       <w>libbzip</w>
       <w>libutf</w>
@@ -786,6 +889,7 @@
       <w>lightshad</w>
       <w>linearsize</w>
       <w>linearstep</w>
+      <w>linebegin</w>
       <w>linemax</w>
       <w>linestart</w>
       <w>linkstoryboards</w>
@@ -812,6 +916,7 @@
       <w>lrintf</w>
       <w>lscope</w>
       <w>lshort</w>
+      <w>lsplits</w>
       <w>lsregister</w>
       <w>lstr</w>
       <w>lsync</w>
@@ -839,6 +944,8 @@
       <w>makelevel</w>
       <w>malhotra</w>
       <w>mallocs</w>
+      <w>manfile</w>
+      <w>manprivpath</w>
       <w>mantype</w>
       <w>manualtab</w>
       <w>maskhigh</w>
@@ -847,6 +954,8 @@
       <w>mastervers</w>
       <w>matchlines</w>
       <w>maximus</w>
+      <w>maxlines</w>
+      <w>maxparts</w>
       <w>maxpathlen</w>
       <w>maxtries</w>
       <w>maxwait</w>
@@ -881,11 +990,15 @@
       <w>mmacosx</w>
       <w>mmask</w>
       <w>mmdevapi</w>
+      <w>mnames</w>
       <w>modder</w>
       <w>modders</w>
       <w>modelview</w>
+      <w>modstr</w>
+      <w>modtime</w>
       <w>moduletype</w>
       <w>momemtary</w>
+      <w>morecnt</w>
       <w>moreso</w>
       <w>mqrspec</w>
       <w>msaa</w>
@@ -920,6 +1033,8 @@
       <w>mystatspage</w>
       <w>mywidget</w>
       <w>namecap</w>
+      <w>namel</w>
+      <w>nameu</w>
       <w>nameval</w>
       <w>nbuffer</w>
       <w>ndebug</w>
@@ -944,6 +1059,8 @@
       <w>newname</w>
       <w>newnode</w>
       <w>newtoken</w>
+      <w>newuuid</w>
+      <w>newuuids</w>
       <w>nextchar</w>
       <w>ninjafightplug</w>
       <w>nitpicky</w>
@@ -983,6 +1100,7 @@
       <w>objcount</w>
       <w>objexists</w>
       <w>objid</w>
+      <w>objpath</w>
       <w>objset</w>
       <w>objsizes</w>
       <w>objtoyaml</w>
@@ -999,7 +1117,10 @@
       <w>oldbook</w>
       <w>olde</w>
       <w>oldname</w>
+      <w>oldpath</w>
       <w>oldtoken</w>
+      <w>olduuid</w>
+      <w>olduuids</w>
       <w>onslaughtplug</w>
       <w>oooo</w>
       <w>ooooooo</w>
@@ -1033,6 +1154,8 @@
       <w>ourself</w>
       <w>ourstanding</w>
       <w>outdict</w>
+      <w>outdir</w>
+      <w>outfiles</w>
       <w>outmsg</w>
       <w>outpath</w>
       <w>outputter</w>
@@ -1044,14 +1167,21 @@
       <w>pairsj</w>
       <w>pairss</w>
       <w>parameteriv</w>
+      <w>parentpath</w>
       <w>passcode</w>
+      <w>patchpaths</w>
+      <w>pathbar</w>
       <w>pathcapture</w>
       <w>pathdst</w>
       <w>pathlist</w>
       <w>pathparts</w>
+      <w>pathsegs</w>
       <w>pathsrc</w>
       <w>pathwonky</w>
       <w>pausable</w>
+      <w>pbasename</w>
+      <w>pbxgrp</w>
+      <w>pbxgrps</w>
       <w>pcommands</w>
       <w>pdataclass</w>
       <w>pdoc</w>
@@ -1063,10 +1193,12 @@
       <w>pflags</w>
       <w>pgmout</w>
       <w>phandle</w>
+      <w>phasename</w>
       <w>phasescriptexecution</w>
       <w>piplist</w>
       <w>pipvers</w>
       <w>pixelformat</w>
+      <w>pkgdir</w>
       <w>platstr</w>
       <w>playerspaztype</w>
       <w>playpause</w>
@@ -1075,6 +1207,8 @@
       <w>pluginsettings</w>
       <w>plugnames</w>
       <w>pname</w>
+      <w>pnamel</w>
+      <w>pnameu</w>
       <w>podcast</w>
       <w>podcasts</w>
       <w>popd</w>
@@ -1082,6 +1216,7 @@
       <w>positivex</w>
       <w>positivey</w>
       <w>positivez</w>
+      <w>posixshmem</w>
       <w>posonlyargs</w>
       <w>postinit</w>
       <w>postrun</w>
@@ -1095,10 +1230,12 @@
       <w>preconfig</w>
       <w>predeclare</w>
       <w>predeclares</w>
+      <w>predecs</w>
       <w>prefs</w>
       <w>preloaded</w>
       <w>preloads</w>
       <w>premult</w>
+      <w>prepass</w>
       <w>prepdata</w>
       <w>prereq</w>
       <w>prerun</w>
@@ -1115,13 +1252,19 @@
       <w>processinfoplistfile</w>
       <w>processpch</w>
       <w>processpchplusplus</w>
+      <w>processproductpackaging</w>
+      <w>processproductpackagingder</w>
       <w>profilers</w>
       <w>prog</w>
       <w>proj</w>
       <w>projbasename</w>
       <w>projdir</w>
+      <w>projectconfig</w>
+      <w>projname</w>
       <w>projpath</w>
       <w>projprefix</w>
+      <w>projsrc</w>
+      <w>projtxt</w>
       <w>prolly</w>
       <w>proxykey</w>
       <w>prtb</w>
@@ -1141,6 +1284,7 @@
       <w>pulseaudio</w>
       <w>punchmomentumlinear</w>
       <w>punchthrough</w>
+      <w>pupdatedata</w>
       <w>pushcall</w>
       <w>putbits</w>
       <w>putbitshigh</w>
@@ -1151,6 +1295,7 @@
       <w>pwin</w>
       <w>pwsz</w>
       <w>pybuildapple</w>
+      <w>pycfgpath</w>
       <w>pycommand</w>
       <w>pyconfig</w>
       <w>pycontext</w>
@@ -1158,6 +1303,7 @@
       <w>pyhome</w>
       <w>pylib</w>
       <w>pylibpath</w>
+      <w>pymodulenames</w>
       <w>pyobj</w>
       <w>pyobjs</w>
       <w>pythondevmode</w>
@@ -1214,6 +1360,7 @@
       <w>rené</w>
       <w>reprfunc</w>
       <w>repro</w>
+      <w>requireable</w>
       <w>rerase</w>
       <w>resends</w>
       <w>resetbtn</w>
@@ -1242,6 +1389,8 @@
       <w>rsplen</w>
       <w>rspobj</w>
       <w>rsptypes</w>
+      <w>rsync's</w>
+      <w>rsyncver</w>
       <w>rtest</w>
       <w>rtypes</w>
       <w>rtypevar</w>
@@ -1261,6 +1410,7 @@
       <w>scenepacket</w>
       <w>scenetime</w>
       <w>screenmessage</w>
+      <w>scriptdst</w>
       <w>scrollwidget</w>
       <w>scutil</w>
       <w>sddata</w>
@@ -1309,10 +1459,13 @@
       <w>shouldnt</w>
       <w>showbuffer</w>
       <w>shufflable</w>
+      <w>signingconfig</w>
+      <w>signingconfigname</w>
       <w>signsubscale</w>
       <w>sigsetjmp</w>
       <w>simd</w>
       <w>simpletype</w>
+      <w>sincestr</w>
       <w>sisssssssss</w>
       <w>sixteenbits</w>
       <w>slist</w>
@@ -1326,6 +1479,7 @@
       <w>sockaddr</w>
       <w>soffs</w>
       <w>softdefault</w>
+      <w>softreq</w>
       <w>solaris</w>
       <w>sortname</w>
       <w>sourcenode</w>
@@ -1333,16 +1487,22 @@
       <w>spaz</w>
       <w>spead</w>
       <w>sphrand</w>
+      <w>spinoff's</w>
+      <w>spinoffconfig</w>
       <w>spinup</w>
       <w>spivak</w>
+      <w>spwd</w>
       <w>srcabs</w>
       <w>srcattr</w>
       <w>srcfolder</w>
+      <w>srcgrp</w>
       <w>srcid</w>
       <w>srcname</w>
       <w>srcpath</w>
       <w>srcpaths</w>
       <w>srcsz</w>
+      <w>srctime</w>
+      <w>srctimestr</w>
       <w>sresult</w>
       <w>sscanf</w>
       <w>ssize</w>
@@ -1375,6 +1535,7 @@
       <w>stephane</w>
       <w>stepnum</w>
       <w>stepsize</w>
+      <w>stgdict</w>
       <w>storagenames</w>
       <w>storecmd</w>
       <w>stot</w>
@@ -1395,6 +1556,7 @@
       <w>subentities</w>
       <w>subfieldpath</w>
       <w>subitems</w>
+      <w>submpath</w>
       <w>subpaths</w>
       <w>subplatform</w>
       <w>subscale</w>
@@ -1404,6 +1566,12 @@
       <w>sval</w>
       <w>swidth</w>
       <w>swiftc</w>
+      <w>swiftcompile</w>
+      <w>swiftdriver</w>
+      <w>swiftdriverjobdiscovery</w>
+      <w>swiftemitmodule</w>
+      <w>swiftgeneratepch</w>
+      <w>swiftmergegeneratedheaders</w>
       <w>symbolification</w>
       <w>syscalls</w>
       <w>sysresponse</w>
@@ -1429,12 +1597,14 @@
       <w>templatefs</w>
       <w>tempvec</w>
       <w>tenum</w>
+      <w>testclinic</w>
       <w>testint</w>
       <w>testinternalcapi</w>
       <w>testnode</w>
       <w>testresponse</w>
       <w>testrunnable</w>
       <w>testtask</w>
+      <w>testtype</w>
       <w>texel</w>
       <w>texqualstr</w>
       <w>textcolor</w>
@@ -1445,6 +1615,8 @@
       <w>theres</w>
       <w>thislinelen</w>
       <w>thismodule</w>
+      <w>thisname</w>
+      <w>thispath</w>
       <w>threadlocals</w>
       <w>threadname</w>
       <w>threadpool</w>
@@ -1459,10 +1631,13 @@
       <w>timesteps</w>
       <w>timetype</w>
       <w>timetypes</w>
+      <w>timevalfin</w>
       <w>tkinval</w>
       <w>tlog</w>
       <w>tmpmat</w>
       <w>tomer</w>
+      <w>tomllib</w>
+      <w>toplevelname</w>
       <w>topos</w>
       <w>totalobjmb</w>
       <w>totalobjsize</w>
@@ -1471,6 +1646,8 @@
       <w>tournamentbutton</w>
       <w>toutf</w>
       <w>tpartial</w>
+      <w>tpath</w>
+      <w>tpathsegs</w>
       <w>tpexl</w>
       <w>tpimport</w>
       <w>tpimportex</w>
@@ -1503,10 +1680,12 @@
       <w>tvos</w>
       <w>tweakage</w>
       <w>twidth</w>
+      <w>tword</w>
       <w>twotimer</w>
       <w>twst</w>
       <w>typeobj</w>
       <w>typestr</w>
+      <w>tzinfo</w>
       <w>tzoffset</w>
       <w>tzpath</w>
       <w>uber</w>
@@ -1537,6 +1716,7 @@
       <w>userspace</w>
       <w>usid</w>
       <w>uther</w>
+      <w>uuidentry</w>
       <w>uuidmodule</w>
       <w>uuids</w>
       <w>uval</w>
@@ -1576,6 +1756,7 @@
       <w>wack</w>
       <w>wakeups</w>
       <w>walisser</w>
+      <w>warnstr</w>
       <w>wasdebug</w>
       <w>wasn</w>
       <w>watte</w>
@@ -1616,9 +1797,12 @@
       <w>wvmpth</w>
       <w>xbone</w>
       <w>xcframework</w>
+      <w>xcft</w>
       <w>xclamped</w>
+      <w>xcode's</w>
       <w>xcodebuildverbose</w>
       <w>xcoderun</w>
+      <w>xcodesortkey</w>
       <w>xcrun</w>
       <w>xdiff</w>
       <w>xdist</w>
diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py
index f7928e00..be97fbb9 100644
--- a/src/assets/ba_data/python/baenv.py
+++ b/src/assets/ba_data/python/baenv.py
@@ -24,8 +24,6 @@ from typing import TYPE_CHECKING
 from efro.log import setup_logging, LogLevel
 
 if TYPE_CHECKING:
-    from typing import Any
-
     from efro.log import LogHandler
 
 # Build number and version of the ballistica binary we expect to be
diff --git a/tools/batools/project/_checks.py b/tools/batools/project/_checks.py
index 4f4135d0..72b2e9d3 100755
--- a/tools/batools/project/_checks.py
+++ b/tools/batools/project/_checks.py
@@ -15,7 +15,6 @@ from efrotools import get_public_license, PYVER
 
 if TYPE_CHECKING:
     from batools.project._updater import ProjectUpdater
-    from batools.featureset import FeatureSet
 
 
 def _get_legal_notice_private() -> str:
diff --git a/tools/batools/spinoff/_context.py b/tools/batools/spinoff/_context.py
index af75b5e6..60673db7 100644
--- a/tools/batools/spinoff/_context.py
+++ b/tools/batools/spinoff/_context.py
@@ -27,7 +27,7 @@ from batools.spinoff._state import (
 )
 
 if TYPE_CHECKING:
-    from typing import Callable, Any, Iterable
+    from typing import Callable, Iterable
 
     from batools.project import ProjectUpdater
 
@@ -77,7 +77,7 @@ class SpinoffContext:
         # By default, if dst files have their modtimes changed but
         # still line up with src files, we can recover. But one may
         # choose to error in that case to track down things mucking
-        # with dst files when they shouldnt' be.
+        # with dst files when they shouldn't be.
         self.strict = False
 
         self._mode = mode
@@ -216,7 +216,7 @@ class SpinoffContext:
         # not manage itself (to prevent accidentally working in such places).
         self.src_write_paths = set[str]()
 
-        # Paths wwhich will NOT be gitignored/etc. (in dst format)
+        # Paths which will NOT be gitignored/etc. (in dst format)
         self.dst_write_paths = set[str]()
 
         # Special set of paths managed by spinoff but ALSO stored in git in
@@ -580,6 +580,8 @@ class SpinoffContext:
     def _generate_env_hash(self) -> None:
         # pylint: disable=cyclic-import
         from efrotools import get_files_hash
+
+        # noinspection PyUnresolvedReferences
         import batools.spinoff
         import batools.project
 
@@ -1570,7 +1572,7 @@ class SpinoffContext:
                 except Exception:
                     self._execution_error = True
                     print(
-                        (f"Error removing file: '{dst_path_full}'."),
+                        f"Error removing file: '{dst_path_full}'.",
                         file=sys.stderr,
                     )
         return removed_f_count
@@ -1654,7 +1656,7 @@ class SpinoffContext:
         out = set[str]()
         assert self._src_git_files is not None
         for gitpath in self._src_git_files:
-            # If omit-path contians this one or any component is found
+            # If omit-path contains this one or any component is found
             # in omit-names, pretend it doesn't exist.
             if _any_path_contains(self._src_omit_paths_expanded, gitpath):
                 continue  # Omitting
@@ -1795,8 +1797,8 @@ class SpinoffContext:
 
         do_backport = False
 
-        src_datab: bytes | None
-        dst_datab: bytes | None
+        src_datab: bytes | None = None
+        dst_datab: bytes | None = None
         src_data: str | None = None
         dst_data: str | None = None
 
diff --git a/tools/batools/spinoff/_main.py b/tools/batools/spinoff/_main.py
index fe1f949d..164189a0 100644
--- a/tools/batools/spinoff/_main.py
+++ b/tools/batools/spinoff/_main.py
@@ -133,7 +133,7 @@ def _do_create(src_root: str | None, dst_root: str) -> None:
     from efrotools import getconfig
     import batools.spinoff
 
-    # Note: in our case dst_root is actualy what becomes the src project
+    # Note: in our case dst_root is actually what becomes the src project
     # should clean up these var names to make that clearer.
     if src_root is not None:
         raise CleanError('This only works on src projects.')
diff --git a/tools/batools/xcodeproject.py b/tools/batools/xcodeproject.py
index c0290650..4d820ce3 100644
--- a/tools/batools/xcodeproject.py
+++ b/tools/batools/xcodeproject.py
@@ -12,6 +12,7 @@ from pbxproj import XcodeProject
 from pbxproj.pbxextensions import TreeType, PBXGroup
 
 # Need to patch XcodeProject slightly to support .cc files.
+# noinspection PyProtectedMember
 xcft = XcodeProject._FILE_TYPES  # pylint: disable=protected-access
 if '.cc' not in xcft:
     xcft['.cc'] = xcft['.cpp']
diff --git a/tools/efro/util.py b/tools/efro/util.py
index a36c2d70..16faf5a4 100644
--- a/tools/efro/util.py
+++ b/tools/efro/util.py
@@ -25,7 +25,7 @@ except ModuleNotFoundError:
 if TYPE_CHECKING:
     import asyncio
     from efro.call import Call as Call  # 'as Call' so we re-export.
-    from typing import Any, Callable, NoReturn
+    from typing import Any, Callable
 
 T = TypeVar('T')
 ValT = TypeVar('ValT')
diff --git a/tools/efrotools/pybuild.py b/tools/efrotools/pybuild.py
index 25171cfa..f011b82e 100644
--- a/tools/efrotools/pybuild.py
+++ b/tools/efrotools/pybuild.py
@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING
 from efrotools import readfile, writefile, replace_exact
 
 if TYPE_CHECKING:
-    from typing import Any
+    pass
 
 # Python version we build here (not necessarily same as we use in repo).
 PY_VER_ANDROID = '3.11'