diff --git a/app/release/output.json b/app/release/output.json
index a12550dd..8ee85bda 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6-alpha6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6-alpha7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
index bfd499b6..6d25e8ba 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -58,7 +58,7 @@ class ReaderAdapter(private val context: Context,
     }
     val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
         override fun getPreloadItems(position: Int): MutableList<File> {
-            return listOf(Cache(context).getImages(galleryID)?.get(position)).filterNotNullTo(mutableListOf())
+            return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
         }
 
         override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index fb91da5c..4ad914db 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -300,7 +300,7 @@ class ReaderActivity : AppCompatActivity() {
                 }
             }
 
-            //addOnScrollListener((adapter as ReaderAdapter).preloader)
+            addOnScrollListener((adapter as ReaderAdapter).preloader)
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)
diff --git a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
index 6e05cbb8..df3f2469 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt
@@ -178,24 +178,27 @@ class Cache(context: Context) : ContextWrapper(context) {
         return reader
     }
 
+    val imageNameRegex = Regex("""^\d+\..+$""")
     fun getImages(galleryID: Int): List<File?>? {
         val gallery = getCachedGallery(galleryID)
-        val reader = getReaderOrNull(galleryID) ?: return null
-        val images = gallery.listFiles() ?: return null
 
-        return reader.galleryInfo.indices.map { index ->
-            images.firstOrNull { file -> file.name.startsWith("%05d".format(index)) }
+        return gallery.list { _, name ->
+            imageNameRegex.matches(name)
+        }?.map {
+            File(gallery, it)
         }
     }
 
-    val imageExts = listOf(
+    val imageExtensions = listOf(
+        "png",
         "jpg",
-        "webp"
+        "webp",
+        "gif"
     )
     fun getImage(galleryID: Int, index: Int): File? {
         val gallery = getCachedGallery(galleryID)
 
-        for (ext in imageExts) {
+        for (ext in imageExtensions) {
             File(gallery, "%05d.$ext".format(index)).let {
                 if (it.exists())
                     return it
diff --git a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
index 8c0efb01..9795530a 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt
@@ -23,7 +23,6 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.SharedPreferences
-import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -253,15 +252,13 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         val cache = Cache(this@DownloadWorker).getImages(galleryID)
 
         progress.put(galleryID, reader.galleryInfo.indices.map { index ->
-            if (cache?.get(index) != null)
+            if (cache?.getOrNull(index) != null)
                 Float.POSITIVE_INFINITY
             else
                 0F
         }.toMutableList())
         exception.put(galleryID, reader.galleryInfo.map { null }.toMutableList())
 
-        Log.i("PUPILD", "READER HERE!")
-
         if (notification[galleryID] == null)
             initNotification(galleryID)
 
diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/search.kt b/libpupil/src/main/java/xyz/quaver/hitomi/search.kt
index 763da89d..1a9d6087 100644
--- a/libpupil/src/main/java/xyz/quaver/hitomi/search.kt
+++ b/libpupil/src/main/java/xyz/quaver/hitomi/search.kt
@@ -169,7 +169,6 @@ fun getSuggestionsFromData(field: String, data: Pair<Long, Int>) : List<Suggesti
 }
 
 fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List<Int> {
-    print("PUPILD: NOZOMI REQUEST: $area:$tag ($language)")
     val nozomiAddress =
             when(area) {
                 null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension"
@@ -189,7 +188,6 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List
     while (arrayBuffer.hasRemaining())
         nozomi.add(arrayBuffer.int)
 
-    print("PUPILD: NOZOMI REQUEST END: $area:$tag ($language)")
     return nozomi
 }