diff --git a/Cargo.lock b/Cargo.lock
index 87bcfa5..d6fcb08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -29,7 +29,7 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web",
- "bitflags",
+ "bitflags 2.6.0",
  "bytes",
  "derive_more",
  "futures-core",
@@ -54,7 +54,7 @@ dependencies = [
  "actix-utils",
  "ahash",
  "base64",
- "bitflags",
+ "bitflags 2.6.0",
  "brotli",
  "bytes",
  "bytestring",
@@ -62,8 +62,8 @@ dependencies = [
  "encoding_rs",
  "flate2",
  "futures-core",
- "h2",
- "http",
+ "h2 0.3.26",
+ "http 0.2.12",
  "httparse",
  "httpdate",
  "itoa",
@@ -99,7 +99,7 @@ checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
 dependencies = [
  "bytestring",
  "cfg-if",
- "http",
+ "http 0.2.12",
  "regex",
  "regex-lite",
  "serde",
@@ -308,6 +308,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -335,6 +341,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -371,6 +383,12 @@ dependencies = [
  "alloc-stdlib",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
 [[package]]
 name = "bytes"
 version = "1.6.1"
@@ -465,6 +483,22 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -583,6 +617,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.3.0"
@@ -595,6 +639,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
 [[package]]
 name = "flate2"
 version = "1.0.30"
@@ -611,6 +661,21 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -620,6 +685,15 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.30"
@@ -688,7 +762,26 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
  "indexmap",
  "slab",
  "tokio",
@@ -737,6 +830,40 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-range"
 version = "0.1.5"
@@ -761,6 +888,79 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "hyper"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -781,6 +981,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -802,6 +1008,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "language-tags"
 version = "0.3.2"
@@ -831,6 +1046,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
 [[package]]
 name = "local-channel"
 version = "0.1.5"
@@ -907,6 +1128,23 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -1022,6 +1260,50 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "openssl"
+version = "0.10.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -1057,6 +1339,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -1163,7 +1465,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -1201,13 +1503,71 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rusqlite"
 version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -1230,12 +1590,74 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+dependencies = [
+ "base64",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "scheduled-thread-pool"
 version = "0.2.7"
@@ -1251,6 +1673,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.23"
@@ -1345,12 +1790,24 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "syn"
 version = "2.0.71"
@@ -1362,6 +1819,46 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.63"
@@ -1454,6 +1951,27 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -1467,6 +1985,33 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -1487,6 +2032,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -1523,6 +2074,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.2"
@@ -1568,12 +2125,98 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "web-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1592,6 +2235,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -1713,6 +2365,16 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ytdlp_server"
 version = "0.1.0"
@@ -1731,6 +2393,7 @@ dependencies = [
  "r2d2",
  "r2d2_sqlite",
  "regex",
+ "reqwest",
  "rusqlite",
  "serde",
  "serde_json",
@@ -1758,6 +2421,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
 [[package]]
 name = "zstd"
 version = "0.13.2"
diff --git a/Cargo.toml b/Cargo.toml
index ce0ba5d..149175e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = { version = "4.8.0" }
 actix-files = { version = "0.6.6" }
+actix-web = { version = "4.8.0" }
 clap = { version = "4.5.4", features = ["derive"] }
 dashmap = { version = "6.0.1" }
 derive_more = { version = "0.99.18" }
@@ -20,6 +20,7 @@ num-traits = { version = "0.2" }
 r2d2 = { version = "0.8.10" }
 r2d2_sqlite = { version = "0.24" }
 regex = { version = "1.10.5" }
+reqwest = { version = "0.12.5" }
 rusqlite = { version = "0.31", features = ["bundled"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index 80fa1e7..e117a3f 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-rm ./index.db
 rm -rf ./data/
diff --git a/src/app.rs b/src/app.rs
index c654c94..ef99185 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -2,6 +2,13 @@ use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, Condvar};
 use thiserror::Error;
 use threadpool::ThreadPool;
+use dashmap::DashMap;
+use crate::{
+    database::{DatabasePool, VideoId, setup_database},
+    metadata::{MetadataCache, Metadata},
+    worker_download::{DownloadCache, DownloadState},
+    worker_transcode::{TranscodeCache, TranscodeKey, TranscodeState},
+};
 
 pub type WorkerThreadPool = Arc<Mutex<ThreadPool>>;
 pub type WorkerCacheEntry<T> = Arc<(Mutex<T>, Condvar)>;
@@ -61,3 +68,33 @@ impl AppConfig {
         Ok(())
     }
 }
+
+#[derive(Clone)]
+pub struct AppState {
+    pub app_config: Arc<AppConfig>,
+    pub db_pool: DatabasePool,
+    pub worker_thread_pool: WorkerThreadPool,
+    pub download_cache: DownloadCache,
+    pub transcode_cache: TranscodeCache,
+    pub metadata_cache: MetadataCache,
+}
+
+impl AppState {
+    pub fn new(app_config: AppConfig, total_transcode_threads: usize) -> Result<Self, Box<dyn std::error::Error>> {
+        let db_manager = r2d2_sqlite::SqliteConnectionManager::file(app_config.data.join("index.db"));
+        let db_pool = DatabasePool::new(db_manager)?;
+        setup_database(db_pool.get()?)?;
+        let worker_thread_pool: WorkerThreadPool = Arc::new(Mutex::new(ThreadPool::new(total_transcode_threads)));
+        let download_cache: DownloadCache = Arc::new(DashMap::<VideoId, WorkerCacheEntry<DownloadState>>::new());
+        let transcode_cache: TranscodeCache = Arc::new(DashMap::<TranscodeKey, WorkerCacheEntry<TranscodeState>>::new());
+        let metadata_cache: MetadataCache = Arc::new(DashMap::<VideoId, Arc<Metadata>>::new());
+        Ok(Self {
+            app_config: Arc::new(app_config),
+            db_pool, 
+            worker_thread_pool,
+            download_cache,
+            transcode_cache,
+            metadata_cache,
+        })
+    }
+}
diff --git a/src/ffmpeg.rs b/src/ffmpeg.rs
index 8995128..6336a00 100644
--- a/src/ffmpeg.rs
+++ b/src/ffmpeg.rs
@@ -138,6 +138,9 @@ const TIME_REGEX: &str = r"(?:\d+:)*\d+(?:\.\d+)?";
 
 #[derive(Clone,Copy,Debug,Default)]
 pub struct TranscodeProgress {
+    pub frame: Option<usize>,
+    pub fps: Option<f32>,
+    pub q_factor: Option<f32>,
     pub size_bytes: Option<usize>,
     pub total_time_transcoded: Option<Time>,
     pub speed_bits: Option<usize>,
@@ -160,7 +163,7 @@ pub enum ParsedStderrLine {
 pub fn parse_stderr_line(line: &str) -> Option<ParsedStderrLine> {
     lazy_static! {
         static ref PROGRESS_REGEX: Regex = Regex::new(format!(
-            r"size\s*=\s*(\d+)({0})\s+time\s*=\s*({1})\s+bitrate\s*=\s*({2})({3})\/s\s+speed\s*=\s*({2})\s*x",
+            r"frame\s*=\s*(\d+)\s+fps\s*=\s*({2})\s+q\s*=\s*({2})\s+size\s*=\s*(\d+)({0})\s+time\s*=\s*({1})\s+bitrate\s*=\s*({2})({3})\/s\s+speed\s*=\s*({2})\s*x",
             BYTES_REGEX, TIME_REGEX, FLOAT32_REGEX, BITS_LONG_REGEX,
         ).as_str()).unwrap();
         static ref SOURCE_INFO_REGEX: Regex = Regex::new(format!(
@@ -170,25 +173,31 @@ pub fn parse_stderr_line(line: &str) -> Option<ParsedStderrLine> {
     }
     let line = line.trim();
     if let Some(captures) = PROGRESS_REGEX.captures(line) {
+        let frame: Option<usize> = captures.get(1).and_then(|m| m.as_str().parse().ok());
+        let fps: Option<f32> = captures.get(2).and_then(|m| m.as_str().parse().ok());
+        let q_factor: Option<f32> = captures.get(3).and_then(|m| m.as_str().parse().ok());
         let size_bytes = {
-            let value: Option<u32> = captures.get(1).and_then(|m| m.as_str().parse().ok());
-            let unit: Option<SizeBytes> = captures.get(2).and_then(|m| m.as_str().try_into().ok());
+            let value: Option<u32> = captures.get(4).and_then(|m| m.as_str().parse().ok());
+            let unit: Option<SizeBytes> = captures.get(5).and_then(|m| m.as_str().try_into().ok());
             match (value, unit) {
                 (Some(value), Some(unit)) => Some(value as usize * unit.to_bytes()),
                 _ => None,
             }
         };
-        let total_time_transcoded: Option<Time> = captures.get(3).and_then(|m| Time::try_from_str(m.as_str()).ok());
+        let total_time_transcoded: Option<Time> = captures.get(6).and_then(|m| Time::try_from_str(m.as_str()).ok());
         let speed_bits = {
-            let value: Option<f32> = captures.get(4).and_then(|m| m.as_str().parse().ok());
-            let unit: Option<SizeBits> = captures.get(5).and_then(|m| SizeBits::try_from_long(m.as_str()));
+            let value: Option<f32> = captures.get(7).and_then(|m| m.as_str().parse().ok());
+            let unit: Option<SizeBits> = captures.get(8).and_then(|m| SizeBits::try_from_long(m.as_str()));
             match (value, unit) {
                 (Some(value), Some(unit)) => Some((value * unit.to_bits() as f32) as usize),
                 _ => None,
             }
         };
-        let speed_factor: Option<f32> = captures.get(6).and_then(|m| m.as_str().parse().ok());
+        let speed_factor: Option<f32> = captures.get(9).and_then(|m| m.as_str().parse().ok());
         let result = TranscodeProgress {
+            frame,
+            fps,
+            q_factor,
             size_bytes,
             total_time_transcoded,
             speed_bits,
diff --git a/src/lib.rs b/src/lib.rs
index c9f0b39..1ec022f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 pub mod app;
 pub mod database;
 pub mod ffmpeg;
+pub mod metadata;
 pub mod routes;
 pub mod util;
 pub mod worker_download;
diff --git a/src/main.rs b/src/main.rs
index a5f0db5..91fc575 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,14 +1,8 @@
-use std::sync::{Arc, Mutex};
 use std::path::PathBuf;
 use actix_web::{middleware, web, App, HttpServer};
 use clap::Parser;
-use dashmap::DashMap;
-use threadpool::ThreadPool;
 use ytdlp_server::{
-    app::{AppConfig, WorkerThreadPool, WorkerCacheEntry},
-    database::{DatabasePool, VideoId, setup_database},
-    worker_download::{DownloadCache, DownloadState},
-    worker_transcode::{TranscodeCache, TranscodeKey, TranscodeState},
+    app::{AppConfig, AppState},
     routes,
 };
 
@@ -42,6 +36,9 @@ struct Args {
 #[actix_web::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = Args::parse();
+    if std::env::var("RUST_LOG").is_err() {
+        std::env::set_var("RUST_LOG", "INFO");
+    }
     env_logger::init();
 
     let total_transcode_threads: usize = match args.total_transcode_threads {
@@ -56,21 +53,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     if let Some(path) = args.ytdlp_binary_path { app_config.ytdlp_binary = PathBuf::from(path); }
     if let Some(path) = args.ffmpeg_binary_path { app_config.ffmpeg_binary = PathBuf::from(path); }
     app_config.seed_directories()?;
-    let db_manager = r2d2_sqlite::SqliteConnectionManager::file(app_config.root.join("index.db"));
-    let db_pool = DatabasePool::new(db_manager)?;
-    setup_database(db_pool.get()?)?;
-    let download_cache: DownloadCache = Arc::new(DashMap::<VideoId, WorkerCacheEntry<DownloadState>>::new());
-    let transcode_cache: TranscodeCache = Arc::new(DashMap::<TranscodeKey, WorkerCacheEntry<TranscodeState>>::new());
-    let worker_thread_pool: WorkerThreadPool = Arc::new(Mutex::new(ThreadPool::new(total_transcode_threads)));
+    let app_state = AppState::new(app_config, total_transcode_threads)?;
     // start server
     const API_PREFIX: &str = "/api/v1";
     HttpServer::new(move || {
         App::new()
-            .app_data(app_config.clone())
-            .app_data(db_pool.clone())
-            .app_data(worker_thread_pool.clone())
-            .app_data(download_cache.clone())
-            .app_data(transcode_cache.clone())
+            .app_data(app_state.clone())
             .service(web::scope(API_PREFIX)
                 .service(routes::request_transcode)
                 .service(routes::delete_transcode)
@@ -82,6 +70,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .service(routes::get_download_state)
                 .service(routes::get_transcode_state)
                 .service(routes::get_download_link)
+                .service(routes::get_metadata)
             )
             .service(actix_files::Files::new("/data", "./data/").show_files_listing())
             .service(actix_files::Files::new("/", "./static/").index_file("index.html"))
diff --git a/src/metadata.rs b/src/metadata.rs
new file mode 100644
index 0000000..64f73c9
--- /dev/null
+++ b/src/metadata.rs
@@ -0,0 +1,74 @@
+use std::{collections::HashMap, sync::Arc};
+use dashmap::DashMap;
+use serde::{Serialize,Deserialize};
+use crate::database::VideoId;
+
+pub type MetadataCache = Arc<DashMap<VideoId, Arc<Metadata>>>;
+
+pub fn get_metadata_url(video_id: &str) -> String {
+    const URL: &str = "https://www.googleapis.com/youtube/v3/videos";
+    const PARTS: &str = "snippet,contentDetails";
+    const API_KEY: &str = "AIzaSyDkmFSz9gH9slSnonGjs8TZEjtAKS4e9cg";
+    format!("{URL}?part={PARTS}&id={video_id}&key={API_KEY}")
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct Thumbnail {
+    pub url: String,
+    pub width: usize,
+    pub height: usize,
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct ContentDetails {
+    pub duration: String,
+    pub dimension: String,
+    pub definition: String,
+    pub caption: String,
+    #[serde(rename="licensedContent")]
+    pub licensed_content: bool,
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct Snippet {
+    #[serde(rename="publishedAt")]
+    pub published_at: String,
+    #[serde(rename="channelId")]
+    pub channel_id: String,
+    pub title: String,
+    pub description: String,
+    pub thumbnails: HashMap<String, Thumbnail>,
+    #[serde(rename="channelTitle")]
+    pub channel_title: String,
+    pub tags: Vec<String>,
+    #[serde(rename="categoryId")]
+    pub category_id: String,
+
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct Item {
+    pub id: String,
+    pub etag: String,
+    pub kind: String,
+    pub snippet: Snippet,
+    #[serde(rename="contentDetails")]
+    pub content_details: ContentDetails,
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct PageInfo {
+    #[serde(rename="totalResults")]
+    pub total_results: usize,
+    #[serde(rename="resultsPerPage")]
+    pub results_per_page: usize,
+}
+
+#[derive(Clone,Debug,Deserialize,Serialize)]
+pub struct Metadata {
+    pub kind: String,
+    pub etag: String,
+    pub items: Vec<Item>,
+    #[serde(rename="pageInfo")]
+    pub page_info: PageInfo,
+}
diff --git a/src/routes.rs b/src/routes.rs
index 744beab..05cd2e2 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -1,20 +1,21 @@
 use std::path::PathBuf;
-
+use std::sync::Arc;
 use actix_web::{
-    web, error, HttpRequest, HttpResponse, 
-    http::StatusCode, 
-    http::header::{ContentType, ContentDisposition, DispositionType, DispositionParam},
+    error, 
+    http::{header::{ContentDisposition, ContentType, DispositionParam, DispositionType}, StatusCode}, 
+    web, HttpRequest, HttpResponse
 };
 use serde::{Deserialize, Serialize};
 use derive_more::Display;
 use crate::database::{
-    DatabasePool, VideoId, VideoIdError, AudioExtension, WorkerStatus,
+    VideoId, VideoIdError, AudioExtension, WorkerStatus,
     delete_ffmpeg_entry, select_ffmpeg_entries, select_ffmpeg_entry,
     delete_ytdlp_entry, select_ytdlp_entries, select_ytdlp_entry,
 };
-use crate::worker_download::{try_start_download_worker, DownloadCache, DownloadState};
-use crate::worker_transcode::{try_start_transcode_worker, TranscodeCache, TranscodeState, TranscodeKey};
-use crate::app::{AppConfig, WorkerThreadPool};
+use crate::metadata::{get_metadata_url, MetadataCache, Metadata};
+use crate::worker_download::{try_start_download_worker, DownloadState};
+use crate::worker_transcode::{try_start_transcode_worker, TranscodeState, TranscodeKey};
+use crate::app::AppState;
 
 #[derive(Debug,Clone,Serialize,Display)]
 #[display(fmt = "UserApiError({},{})", error, status_code)]
@@ -77,21 +78,19 @@ pub async fn request_transcode(req: HttpRequest, path: web::Path<(String, String
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
     let audio_ext = AudioExtension::try_from(audio_ext.as_str()).map_err(|_| ApiError::invalid_audio_extension(audio_ext))?;
     let transcode_key = TranscodeKey { video_id: video_id.clone(), audio_ext };
-    let download_cache = req.app_data::<DownloadCache>().unwrap().clone();
-    let transcode_cache = req.app_data::<TranscodeCache>().unwrap().clone();
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let worker_thread_pool: WorkerThreadPool = req.app_data::<WorkerThreadPool>().unwrap().clone();
-    let app_config = req.app_data::<AppConfig>().unwrap().clone();
+    let app = req.app_data::<AppState>().unwrap().clone();
     // download audio file
     let mut response = RequestTranscodeResponse::default();
     response.download_status = try_start_download_worker(
         video_id.clone(),
-        download_cache.clone(), app_config.clone(), db_pool.clone(), worker_thread_pool.clone(),
+        app.download_cache.clone(), app.app_config.clone(), app.db_pool.clone(), app.worker_thread_pool.clone(),
     ).map_err(ApiError::internal_server)?;
     // transcode
+    let metadata = get_metadata_from_cache(video_id, app.metadata_cache).await.ok();
     response.transcode_status = try_start_transcode_worker(
         transcode_key.clone(),
-        download_cache, transcode_cache, app_config.clone(), db_pool.clone(), worker_thread_pool.clone(),
+        app.download_cache, app.transcode_cache, app.app_config.clone(), app.db_pool.clone(), app.worker_thread_pool.clone(),
+        metadata,
     ).map_err(ApiError::internal_server)?;
     Ok(HttpResponse::Ok().json(response))
 }
@@ -116,14 +115,13 @@ enum DeleteResponse {
 pub async fn delete_download(req: HttpRequest, path: web::Path<String>) -> actix_web::Result<HttpResponse> {
     let video_id = path.into_inner();
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
-    let download_cache = req.app_data::<DownloadCache>().unwrap().clone();
-    let download_state = download_cache.entry(video_id.clone()).or_default();
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let download_state = app.download_cache.entry(video_id.clone()).or_default();
     let mut state = download_state.0.lock().unwrap();
     if state.worker_status.is_busy() {
         return Ok(HttpResponse::Ok().json(DeleteResponse::Busy));
     }
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entry = select_ytdlp_entry(&db_conn, &video_id).map_err(ApiError::internal_server)?;
     let Some(entry) = entry else { return Ok(HttpResponse::NotFound().finish()); };
     let total_deleted = delete_ytdlp_entry(&db_conn, &video_id).map_err(ApiError::internal_server)?;
@@ -150,14 +148,13 @@ pub async fn delete_transcode(req: HttpRequest, path: web::Path<(String, String)
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
     let audio_ext = AudioExtension::try_from(audio_ext.as_str()).map_err(|_| ApiError::invalid_audio_extension(audio_ext))?;
     let transcode_key = TranscodeKey { video_id: video_id.clone(), audio_ext };
-    let transcode_cache = req.app_data::<TranscodeCache>().unwrap().clone();
-    let transcode_state = transcode_cache.entry(transcode_key.clone()).or_default();
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let transcode_state = app.transcode_cache.entry(transcode_key.clone()).or_default();
     let mut state = transcode_state.0.lock().unwrap();
     if state.worker_status.is_busy() {
         return Ok(HttpResponse::Ok().json(DeleteResponse::Busy));
     }
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entry = select_ffmpeg_entry(&db_conn, &video_id, audio_ext).map_err(ApiError::internal_server)?;
     let Some(entry) = entry else { return Ok(HttpResponse::NotFound().finish()); };
     let total_deleted = delete_ffmpeg_entry(&db_conn, &video_id, audio_ext).map_err(ApiError::internal_server)?;
@@ -180,16 +177,16 @@ pub async fn delete_transcode(req: HttpRequest, path: web::Path<(String, String)
 
 #[actix_web::get("/get_downloads")]
 pub async fn get_downloads(req: HttpRequest) -> actix_web::Result<HttpResponse> {
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entries = select_ytdlp_entries(&db_conn).map_err(ApiError::internal_server)?;
     Ok(HttpResponse::Ok().json(entries))
 }
 
 #[actix_web::get("/get_transcodes")]
 pub async fn get_transcodes(req: HttpRequest) -> actix_web::Result<HttpResponse> {
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entries = select_ffmpeg_entries(&db_conn).map_err(ApiError::internal_server)?;
     Ok(HttpResponse::Ok().json(entries))
 }
@@ -198,8 +195,8 @@ pub async fn get_transcodes(req: HttpRequest) -> actix_web::Result<HttpResponse>
 pub async fn get_download(req: HttpRequest, path: web::Path<String>) -> actix_web::Result<HttpResponse> {
     let video_id = path.into_inner();
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entry = select_ytdlp_entry(&db_conn, &video_id).map_err(ApiError::internal_server)?;
     let Some(entry) = entry else {
         return Ok(HttpResponse::NotFound().finish());
@@ -212,8 +209,8 @@ pub async fn get_transcode(req: HttpRequest, path: web::Path<(String, String)>)
     let (video_id, audio_ext) = path.into_inner();
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
     let audio_ext = AudioExtension::try_from(audio_ext.as_str()).map_err(|_| ApiError::invalid_audio_extension(audio_ext))?;
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entry = select_ffmpeg_entry(&db_conn, &video_id, audio_ext).map_err(ApiError::internal_server)?;
     let Some(entry) = entry else {
         return Ok(HttpResponse::NotFound().finish());
@@ -225,8 +222,8 @@ pub async fn get_transcode(req: HttpRequest, path: web::Path<(String, String)>)
 pub async fn get_download_state(req: HttpRequest, path: web::Path<String>) -> actix_web::Result<HttpResponse> {
     let video_id = path.into_inner();
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
-    let download_cache = req.app_data::<DownloadCache>().unwrap().clone();
-    if let Some(download_state) = download_cache.get(&video_id) {
+    let app = req.app_data::<AppState>().unwrap().clone();
+    if let Some(download_state) = app.download_cache.get(&video_id) {
         let download_state = download_state.0.lock().unwrap();
         if download_state.worker_status != WorkerStatus::None {
             return Ok(HttpResponse::Ok().json(download_state.clone()));
@@ -241,8 +238,8 @@ pub async fn get_transcode_state(req: HttpRequest, path: web::Path<(String, Stri
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
     let audio_ext = AudioExtension::try_from(audio_ext.as_str()).map_err(|_| ApiError::invalid_audio_extension(audio_ext))?;
     let transcode_key = TranscodeKey { video_id: video_id.clone(), audio_ext };
-    let transcode_cache = req.app_data::<TranscodeCache>().unwrap().clone();
-    if let Some(transcode_state) = transcode_cache.get(&transcode_key) {
+    let app = req.app_data::<AppState>().unwrap().clone();
+    if let Some(transcode_state) = app.transcode_cache.get(&transcode_key) {
         let transcode_state = transcode_state.0.lock().unwrap();
         if transcode_state.worker_status != WorkerStatus::None {
             return Ok(HttpResponse::Ok().json(transcode_state.clone()));
@@ -263,8 +260,8 @@ pub async fn get_download_link(
     let (video_id, audio_ext) = path.into_inner();
     let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
     let audio_ext = AudioExtension::try_from(audio_ext.as_str()).map_err(|_| ApiError::invalid_audio_extension(audio_ext))?;
-    let db_pool = req.app_data::<DatabasePool>().unwrap().clone();
-    let db_conn = db_pool.get().map_err(ApiError::internal_server)?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let db_conn = app.db_pool.get().map_err(ApiError::internal_server)?;
     let entry = select_ffmpeg_entry(&db_conn, &video_id, audio_ext).map_err(ApiError::internal_server)?;
     let Some(entry) = entry else {
         return Err(error::ErrorNotFound(format!("{0}/{1}", video_id.as_str(), audio_ext.as_str())));
@@ -286,3 +283,25 @@ pub async fn get_download_link(
         });
     Ok(attachment)
 }
+
+#[actix_web::get("/get_metadata/{video_id}")]
+pub async fn get_metadata(req: HttpRequest, path: web::Path<String>) -> actix_web::Result<HttpResponse> {
+    let video_id = path.into_inner();
+    let video_id = VideoId::try_new(video_id.as_str()).map_err(|e| ApiError::invalid_video_id(video_id, e))?;
+    let app = req.app_data::<AppState>().unwrap().clone();
+    let metadata = get_metadata_from_cache(video_id, app.metadata_cache).await.map_err(ApiError::internal_server)?;
+    Ok(HttpResponse::Ok().json(metadata.as_ref()))
+}
+
+async fn get_metadata_from_cache(video_id: VideoId, cache: MetadataCache) -> Result<Arc<Metadata>, Box<dyn std::error::Error>> {
+    if let Some(metadata) = cache.get(&video_id) {
+        return Ok(metadata.clone());
+    }
+    let metadata_url = get_metadata_url(video_id.as_str());
+    let response = reqwest::get(metadata_url).await?;
+    let metadata = response.text().await?;
+    let metadata: Metadata = serde_json::from_str(metadata.as_str())?;
+    let metadata = Arc::new(metadata);
+    cache.insert(video_id, metadata.clone());
+    Ok(metadata)
+}
diff --git a/src/worker_download.rs b/src/worker_download.rs
index 6bf098e..c8bf4e6 100644
--- a/src/worker_download.rs
+++ b/src/worker_download.rs
@@ -96,7 +96,7 @@ pub enum DownloadError {
 }
 
 pub fn try_start_download_worker(
-    video_id: VideoId, download_cache: DownloadCache, app_config: AppConfig,
+    video_id: VideoId, download_cache: DownloadCache, app_config: Arc<AppConfig>,
     db_pool: DatabasePool, worker_thread_pool: WorkerThreadPool,
 ) -> Result<WorkerStatus, DownloadStartError> {
     // check if download in progress (cache hit)
@@ -195,7 +195,7 @@ pub fn try_start_download_worker(
 }
 
 fn enqueue_download_worker(
-    video_id: VideoId, download_cache: DownloadCache, app_config: AppConfig, db_pool: DatabasePool,
+    video_id: VideoId, download_cache: DownloadCache, app_config: Arc<AppConfig>, db_pool: DatabasePool,
     system_log_writer: Arc<Mutex<impl Write>>,
 ) -> Result<PathBuf, DownloadError> {
     // logging files
diff --git a/src/worker_transcode.rs b/src/worker_transcode.rs
index e427ed8..294a8f5 100644
--- a/src/worker_transcode.rs
+++ b/src/worker_transcode.rs
@@ -15,6 +15,7 @@ use crate::database::{
     select_ytdlp_entry,
 };
 use crate::util::{get_unix_time, defer, ConvertCarriageReturnToNewLine};
+use crate::metadata::{Metadata, Thumbnail};
 use crate::worker_download::DownloadCache;
 use crate::ffmpeg;
 
@@ -75,6 +76,11 @@ fn update_field<T>(dst: &mut Option<T>, src: Option<T>) {
 impl TranscodeState {
     pub fn update_from_progress(&mut self, progress: ffmpeg::TranscodeProgress) {
         self.end_time_unix = get_unix_time();
+        // NOTE: we get multiple progress stats including from thumbnail which makes no sense
+        //       since we bind thumbnail to source 1, we can ignore this
+        if progress.frame != Some(0) {
+            return;
+        }
         update_field(&mut self.transcode_size_bytes, progress.size_bytes);
         update_field(&mut self.transcode_duration_milliseconds , progress.total_time_transcoded.map(|t| t.to_milliseconds()));
         update_field(&mut self.transcode_speed_bits, progress.speed_bits);
@@ -83,6 +89,15 @@ impl TranscodeState {
 
     pub fn update_from_source_info(&mut self, info: ffmpeg::TranscodeSourceInfo) {
         self.end_time_unix = get_unix_time();
+        // NOTE: we specify multiple sources including thumbnail which gives dodgy info
+        //       we check for this by only updating from the longest duration source info
+        if let Some(old_duration) = self.source_duration_milliseconds {
+            if let Some(new_duration) = info.duration.map(|t| t.to_milliseconds()) {
+                if new_duration < old_duration {
+                    return;
+                }
+            }
+        }
         update_field(&mut self.source_duration_milliseconds, info.duration.map(|t| t.to_milliseconds()));
         update_field(&mut self.source_start_time_milliseconds, info.start_time.map(|t| t.to_milliseconds()));
         update_field(&mut self.source_speed_bits, info.speed_bits);
@@ -125,8 +140,9 @@ pub enum TranscodeError {
 
 pub fn try_start_transcode_worker(
     key: TranscodeKey,
-    download_cache: DownloadCache, transcode_cache: TranscodeCache, app_config: AppConfig, 
+    download_cache: DownloadCache, transcode_cache: TranscodeCache, app_config: Arc<AppConfig>, 
     db_pool: DatabasePool, worker_thread_pool: WorkerThreadPool,
+    metadata: Option<Arc<Metadata>>,
 ) -> Result<WorkerStatus, TranscodeStartError> {
     // check if transcode in progress (cache hit)
     {
@@ -198,6 +214,7 @@ pub fn try_start_transcode_worker(
         let res = enqueue_transcode_worker(
             key.clone(), download_cache.clone(), transcode_cache.clone(), 
             app_config.clone(), db_pool.clone(), system_log_writer.clone(),
+            metadata,
         );
         if let Err(ref err) = res {
             let _ = writeln!(&mut system_log_writer.lock().unwrap(), "[error] Worker failed with: {err:?}");
@@ -227,7 +244,8 @@ pub fn try_start_transcode_worker(
 
 fn enqueue_transcode_worker(
     key: TranscodeKey, download_cache: DownloadCache, transcode_cache: TranscodeCache,
-    app_config: AppConfig, db_pool: DatabasePool, system_log_writer: Arc<Mutex<impl Write>>,
+    app_config: Arc<AppConfig>, db_pool: DatabasePool, system_log_writer: Arc<Mutex<impl Write>>,
+    metadata: Option<Arc<Metadata>>,
 ) -> Result<PathBuf, TranscodeError> {
     let filename = format!("{0}.{1}", key.video_id.as_str(), key.audio_ext.as_str());
     let audio_path = app_config.transcode.join(filename.as_str());
@@ -257,16 +275,17 @@ fn enqueue_transcode_worker(
     if !source_path.exists() {
         return Err(TranscodeError::DownloadFileMissing(source_path));
     }
+    // NOTE: Don't copy since we do extra stuff like embed thumbnail and video metadata
     // If the download path is the same format as transcode path then just copy it
-    if source_path.file_name() == audio_path.file_name() {
-        let _ = std::fs::copy(source_path.clone(), audio_path.clone()).map_err(TranscodeError::CopyDownloadSameFormat)?;
-        writeln!(
-            &mut system_log_writer.lock().unwrap(), 
-            "Transcode has same format as download. Copying {0} to {1}", 
-            source_path.to_string_lossy(), audio_path.to_string_lossy(),
-        ).map_err(WorkerError::SystemWriteFail)?;
-        return Ok(audio_path);
-    }
+    // if source_path.file_name() == audio_path.file_name() {
+    //     let _ = std::fs::copy(source_path.clone(), audio_path.clone()).map_err(TranscodeError::CopyDownloadSameFormat)?;
+    //     writeln!(
+    //         &mut system_log_writer.lock().unwrap(), 
+    //         "Transcode has same format as download. Copying {0} to {1}", 
+    //         source_path.to_string_lossy(), audio_path.to_string_lossy(),
+    //     ).map_err(WorkerError::SystemWriteFail)?;
+    //     return Ok(audio_path);
+    // }
     // TODO: avoid retranscodeing file if on disk already - make this an option
     // if audio_path.exists() {
     //     *is_transcoded.borrow_mut() = true;
@@ -276,13 +295,54 @@ fn enqueue_transcode_worker(
     let stdout_log_path = app_config.transcode.join(format!("{}.stdout.log", key.as_str()));
     let stderr_log_path = app_config.transcode.join(format!("{}.stderr.log", key.as_str()));
     // spawn process
-    let process_res = Command::new(app_config.ffmpeg_binary.clone())
-        .args([
-            "-i", source_path.to_str().unwrap(),
+    let process_args = {
+        let mut args = Vec::<String>::new();
+        let push_args = |args: &mut Vec<String>, values: &[&str]| args.extend(values.iter().map(|&s| s.to_owned()));
+        push_args(&mut args, &["-i", source_path.to_str().unwrap()]);
+        let can_embed_thumbnail = &[AudioExtension::MP3].contains(&key.audio_ext);
+        let thumbnail = || -> Option<Thumbnail> {
+            if !can_embed_thumbnail {
+                return None;
+            }
+            let metadata = metadata.clone()?;
+            let item = metadata.items.first()?;
+            let mut thumbnails: Vec<Thumbnail> = item.snippet.thumbnails.values().cloned().collect();
+            thumbnails.sort_by_key(|thumbnail| thumbnail.width * thumbnail.height);
+            thumbnails.last().cloned()
+        } ();
+        if let Some(ref thumbnail) = thumbnail {
+            push_args(&mut args, &["-i", thumbnail.url.as_str()]);
+        }
+        push_args(&mut args, &["-map", "0:a"]);
+        if thumbnail.is_some() {
+            push_args(&mut args, &["-map", "1"]);
+        }
+        if let Some(metadata) = metadata {
+            if let Some(item) = metadata.items.first() {
+                let push_metadata = |args: &mut Vec<String>, field: &str, value: String| {
+                    args.extend(["-metadata".to_owned(), format!("{0}={1}", field, value)]);
+                };
+                push_metadata(&mut args, "title", item.snippet.title.to_owned());
+                push_metadata(&mut args, "artist", item.snippet.channel_title.to_owned());
+                push_metadata(&mut args, "description", item.snippet.description.to_owned());
+                push_metadata(&mut args, "published_at", item.snippet.published_at.to_owned());
+                push_args(&mut args, &["-id3v2_version", "3"]);
+                let mut thumbnails: Vec<(&String, &Thumbnail)> = item.snippet.thumbnails.iter().collect();
+                thumbnails.sort_by_key(|(_, thumbnail)| thumbnail.width * thumbnail.height);
+            }
+        }
+        if thumbnail.is_some() {
+            push_args(&mut args, &["-disposition:0", "attached_pic"]);
+        }
+        push_args(&mut args, &[
             "-threads", "0",
             "-progress", "-", "-y",
             audio_path.to_str().unwrap(),
-        ])
+        ]);
+        args
+    };
+    let process_res = Command::new(app_config.ffmpeg_binary.clone())
+        .args(process_args.as_slice())
         .stdin(Stdio::null())
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())
diff --git a/src/ytdlp.rs b/src/ytdlp.rs
index f0a86a9..a94ddfa 100644
--- a/src/ytdlp.rs
+++ b/src/ytdlp.rs
@@ -8,7 +8,6 @@ use serde::Serialize;
 pub fn get_ytdlp_arguments<'a>(url: &'a str, ffmpeg_binary_path: &'a str, output_format: &'a str) -> impl IntoIterator<Item=impl AsRef<OsStr> + 'a> {
     [
         url,
-        "--no-continue", // override existing files
         "--extract-audio",
         "--format", "bestaudio",
         "--no-continue", // override existing files
diff --git a/static/api.js b/static/api.js
index d5afa10..350411b 100644
--- a/static/api.js
+++ b/static/api.js
@@ -68,19 +68,13 @@ export class TranscodeApi {
     if (!response.ok) throw response;
     return await response.json();
   }
-}
 
-export class YoutubeApi {
   static get_metadata_link = (id) => {
-    const URL = "https://www.googleapis.com/youtube/v3/videos";
-    const PARTS = "snippet,contentDetails"
-    const API_KEY = "AIzaSyDkmFSz9gH9slSnonGjs8TZEjtAKS4e9cg";
-    let url = `${URL}?part=${PARTS}&id=${id}&key=${API_KEY}`;
-    return url;
+    return `${API_URL}/get_metadata/${id}`;
   }
+
   static get_metadata = async (id) => {
-    let url = this.get_metadata_link(id);
-    let response = await fetch(url);
+    let response = await fetch(`${API_URL}/get_metadata/${id}`);
     if (!response.ok) throw response;
     let data = await response.json();
     if (data.items.length === 0) {
diff --git a/static/fragments/metadata.js b/static/fragments/metadata.js
index 848d017..dbdcebe 100644
--- a/static/fragments/metadata.js
+++ b/static/fragments/metadata.js
@@ -1,4 +1,4 @@
-import { YoutubeApi } from "../api.js";
+import { TranscodeApi } from "../api.js";
 import { youtube_duration_string_to_dhms, convert_dhms_to_string } from "../util.js";
 
 export const Metadata = {
@@ -7,7 +7,7 @@ export const Metadata = {
   },
   computed: {
     metadata_link() {
-      return YoutubeApi.get_metadata_link(this.metadata.id);
+      return TranscodeApi.get_metadata_link(this.metadata.id);
     },
     video_link() {
       return `https://youtube.com/watch?v=${this.metadata.id}`;
diff --git a/static/fragments/transcode_progress.js b/static/fragments/transcode_progress.js
index 2d463e9..93dfaae 100644
--- a/static/fragments/transcode_progress.js
+++ b/static/fragments/transcode_progress.js
@@ -82,23 +82,30 @@ export const TranscodeProgress = {
       let remaining_percentage = 1 - percentage;
       let eta_seconds = (time_elapsed_seconds/percentage)*remaining_percentage;
 
+      // NOTE: This is now garbage because the transcode size gives erroneous values when embedding thumbnail
       // estimate size of final file
-      let estimated_total_bytes = this.progress.transcode_size_bytes/percentage;
-      let [curr_bytes, curr_bytes_unit] = convert_to_short_standard_prefix(this.progress.transcode_size_bytes);
-      let [total_bytes, total_bytes_unit] = convert_to_short_standard_prefix(estimated_total_bytes);
-
+      // let estimated_total_bytes = this.progress.transcode_size_bytes/percentage;
+      // let [curr_bytes, curr_bytes_unit] = convert_to_short_standard_prefix(this.progress.transcode_size_bytes);
+      // let [total_bytes, total_bytes_unit] = convert_to_short_standard_prefix(estimated_total_bytes);
+      //
       // estimate speed of transcode
-      let estimated_speed_bytes = (time_elapsed_seconds) == 0 ? 0 : this.progress.transcode_size_bytes / time_elapsed_seconds;
-      let [speed_bytes, speed_bytes_unit] = convert_to_short_standard_prefix(estimated_speed_bytes);
+      // let estimated_speed_bytes = (time_elapsed_seconds == 0) ? 0 : this.progress.transcode_size_bytes / time_elapsed_seconds;
+      // let [speed_bytes, speed_bytes_unit] = convert_to_short_standard_prefix(estimated_speed_bytes);
+  
+      // Estimate speed of transcode in time per second
+      let estimated_speed_time = (time_elapsed_seconds == 0) ? 0 : this.progress.transcode_duration_milliseconds / time_elapsed_seconds;
+      let estimated_speed_time_str = convert_dhms_to_string(convert_seconds_to_dhms(estimated_speed_time/1000));
 
       let eta_string = `ETA ${convert_dhms_to_string(convert_seconds_to_dhms(eta_seconds))}`;
       let curr_time_string = convert_dhms_to_string(convert_seconds_to_dhms(this.progress.transcode_duration_milliseconds/1000));
       let total_time_string = convert_dhms_to_string(convert_seconds_to_dhms(this.progress.source_duration_milliseconds/1000));
 
       let text_time_progress = `${curr_time_string}/${total_time_string}`;
-      let text_size_progress = `${curr_bytes.toFixed(2)}${curr_bytes_unit}B/${total_bytes.toFixed(2)}${total_bytes_unit}B`;
-      let text_speed = `${speed_bytes.toFixed(2)}${speed_bytes_unit}B/s`;
-      let text = `${text_time_progress} - ${text_size_progress} @ ${text_speed} (${eta_string})`
+      // let text_size_progress = `${curr_bytes.toFixed(2)}${curr_bytes_unit}B/${total_bytes.toFixed(2)}${total_bytes_unit}B`;
+      // let text_speed = `${speed_bytes.toFixed(2)}${speed_bytes_unit}B/s`;
+      // let text = `${text_time_progress} - ${text_size_progress} @ ${text_speed} (${eta_string})`
+      let text_speed = `${estimated_speed_time_str}/s`;
+      let text = `${text_time_progress} @ ${text_speed} (${eta_string})`
       return text;
     },
     table_information() {
diff --git a/static/index.js b/static/index.js
index 99698a3..3d23793 100644
--- a/static/index.js
+++ b/static/index.js
@@ -1,5 +1,5 @@
 import { createApp } from "./vendor/vue.esm-browser.prod.js";
-import { TranscodeApi, YoutubeApi, WorkerStatus } from "./api.js";
+import { TranscodeApi, WorkerStatus } from "./api.js";
 import { Column, ColumnType, Table } from "./fragments/table.js";
 import { DownloadProgress } from "./fragments/download_progress.js";
 import { TranscodeProgress } from "./fragments/transcode_progress.js";
@@ -100,7 +100,7 @@ export let create_app = () => createApp({
     },
     async load_metadata() {
       this.metadata = null;
-      let res = await YoutubeApi.get_metadata(this.request_id);
+      let res = await TranscodeApi.get_metadata(this.request_id);
       if (res === null) {
         this.transcode_request.url_error = "Youtube metadata was not found";
         return;