diff --git a/.github/ISSUE_TEMPLATE/bug-crash-report.yml b/.github/ISSUE_TEMPLATE/bug-crash-report.yml
index 0faf9621c..614c45a41 100644
--- a/.github/ISSUE_TEMPLATE/bug-crash-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-crash-report.yml
@@ -63,9 +63,9 @@ body:
       description: |
         If possible, provide a stack trace or a Logcat. This can help identify the issue. 
         To take a logcat, you must do the following:
-        1. Use a desktop/laptop to download the android platform tools from https://developer.android.com/studio/releases/platform-tools.
+        1. Use a desktop/laptop to download the android platform tools from [here](https://developer.android.com/studio/releases/platform-tools).
         2. Extract the downloaded file to a folder.
-        3. Enable USB debugging on your phone [See https://developer.android.com/studio/command-line/adb#Enabling], and then connect your
+        3. Enable USB debugging on your phone [Instructions](https://developer.android.com/studio/command-line/adb#Enabling), and then connect your
         phone to a laptop. You will get a prompt to "Allow USB debugging" when you run the logcat command. Accept this.
         4. Open up a terminal/command prompt in that folder and run:
             - `./adb -d logcat | grep -i "[DWE] Auxio"` in the case of a bug (may require some changes on windows)
diff --git a/app/src/main/java/org/oxycblt/auxio/image/extractor/Images.kt b/app/src/main/java/org/oxycblt/auxio/image/extractor/Images.kt
index 30a7125d1..df9f4ba19 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/extractor/Images.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/extractor/Images.kt
@@ -54,7 +54,7 @@ object Images {
     ): FetchResult? {
         if (streams.size < 4) {
             return streams.firstOrNull()?.let { stream ->
-                return SourceResult(
+                SourceResult(
                     source = ImageSource(stream.source().buffer(), context),
                     mimeType = null,
                     dataSource = DataSource.DISK)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
index ca371c0fc..8440a62c3 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
@@ -168,7 +168,7 @@ class ReadWriteCacheExtractor(private val context: Context) : WriteOnlyCacheExtr
  * @see [CacheExtractor]
  */
 private class CacheDatabase(context: Context) :
-    SQLiteOpenHelper(context, File(context.cacheDir, DB_NAME).absolutePath, null, DB_VERSION) {
+    SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {
     override fun onCreate(db: SQLiteDatabase) {
         // Map the cacheable raw song fields to database fields. Cache-able in this context
         // means information independent of the file-system, excluding IDs and timestamps required
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
index 33e2cf32b..8ec2adadd 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
@@ -89,7 +89,7 @@ abstract class MediaStoreExtractor(
         val args = mutableListOf<String>()
         var selector = BASE_SELECTOR
 
-        // Filter out music that is not music, if enabled.
+        // Filter out audio that is not music, if enabled.
         if (settings.excludeNonMusic) {
             logD("Excluding non-music")
             selector += " AND ${MediaStore.Audio.AudioColumns.IS_MUSIC}=1"
@@ -514,7 +514,7 @@ open class Api29MediaStoreExtractor(context: Context, cacheExtractor: CacheExtra
 
     override fun populateMetadata(cursor: Cursor, raw: Song.Raw) {
         super.populateMetadata(cursor, raw)
-        // This backend is volume-aware, but does not support the modern track columns.
+        // This extractor is volume-aware, but does not support the modern track columns.
         // Use the old column instead. See unpackTrackNo/unpackDiscNo for an explanation
         // of how this column is set up.
         val rawTrack = cursor.getIntOrNull(trackIndex)
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
index fd9ebc425..37bd179e7 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
@@ -127,6 +127,7 @@ class PlaybackPanelFragment :
         when (item.itemId) {
             R.id.action_open_equalizer -> {
                 // Launch the system equalizer app, if possible.
+                // TODO: Move this to a utility
                 val equalizerIntent =
                     Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL)
                         // Provide audio session ID so equalizer can show options for this app