diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 83593703..2667125b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,16 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="PyAugmentAssignmentInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="2">
+            <item index="0" class="java.lang.String" itemvalue="3.13" />
+            <item index="1" class="java.lang.String" itemvalue="3.12" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
     <inspection_tool class="PyMissingOrEmptyDocstringInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
@@ -11,14 +21,6 @@
         </list>
       </option>
     </inspection_tool>
-    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="N803" />
-          <option value="N806" />
-        </list>
-      </option>
-    </inspection_tool>
     <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="ignoredNames">
         <list>
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/docs/howto.local.playlist.load-save.rst b/docs/howto.local.playlist.load-save.rst
index fa6b3d57..6f5bbb33 100644
--- a/docs/howto.local.playlist.load-save.rst
+++ b/docs/howto.local.playlist.load-save.rst
@@ -34,8 +34,8 @@ You can also just have Musify automatically determine the playlist type to load
    :language: Python
    :lines: 19-21
 
-If you already have some tracks loaded and you want the playlist to only use those tracks instead of loading
-the tracks itself, you can pass these pre-loaded tracks to the playlist too.
+If you already have some tracks loaded, and you want the playlist to only use those tracks instead of loading
+the tracks itself, you can pass these preloaded tracks to the playlist too.
 
 .. literalinclude:: _howto/scripts/local.playlist.load-save.py
    :language: Python
diff --git a/docs/howto.spotify.load.rst b/docs/howto.spotify.load.rst
index e77ca8f5..c7229fa3 100644
--- a/docs/howto.spotify.load.rst
+++ b/docs/howto.spotify.load.rst
@@ -11,8 +11,8 @@ In this example, you will:
 .. include:: _howto/setup.logging.txt
 
 
-Setup the Spotify API
----------------------
+Set up the Spotify API
+----------------------
 
 1. If you don't already have one, create a `Spotify for Developers <https://developer.spotify.com/dashboard>`_ account.
 
diff --git a/musify/processors/match.py b/musify/processors/match.py
index 6e166222..a18cc7aa 100644
--- a/musify/processors/match.py
+++ b/musify/processors/match.py
@@ -102,10 +102,15 @@ def _log_algorithm(self, source: MusifyObject, extra: Iterable[str] = ()) -> Non
             log.extend(extra)
         self.log_messages(log, pad='>')
 
-    def _log_test[T: MusifyObject](self, source: T, result: T, test: Any, extra: Iterable[str] = ()) -> None:
+    def _log_test[T: MusifyObject](self, source: T, result: T | None, test: Any, extra: Iterable[str] = ()) -> None:
         """Wrapper for initially logging a test result in a uniform aligned format"""
         algorithm = inspect.stack()[1][0].f_code.co_name.replace("match", "").upper().lstrip("_").replace("_", " ")
-        log_result = f"> Testing URI: {result.uri}" if hasattr(result, "uri") else "> Test failed"
+
+        if result is not None and hasattr(result, "uri"):
+            log_result = f"> Testing URI: {result.uri}"
+        else:
+            log_result = "> Test failed"
+
         log = [source.name, log_result, f"{algorithm:<10}={test:<5}"]
         if extra:
             log.extend(extra)
@@ -327,10 +332,10 @@ def match[T: MusifyObject](
             ]
             self._log_match(source=source, result=result, extra=extra)
             return result
-        else:
-            self._log_test(
-                source=source, result=result, test=score, extra=[f"NO MATCH: {score:.2f}<{min_score:.2f}"]
-            )
+
+        self._log_test(
+            source=source, result=result, test=score, extra=[f"NO MATCH: {score:.2f}<{min_score:.2f}"]
+        )
 
     def _score[T: MusifyObject](
             self,
@@ -419,8 +424,8 @@ def _get_scores[T: MusifyObject](
 
         return scores
 
+    @staticmethod
     def _get_match_from_scores[T: MusifyObject](
-            self,
             scores: Iterable[tuple[T, dict[TagField, Future[float] | list[list[Future[float]]]]]],
             max_score: float,
     ) -> tuple[T | None, float]: