diff --git a/src/components/AddMediaModal/index.tsx b/src/components/AddMediaModal/index.tsx
index 17903044e8999108192e3b163dd454df9e551059..be0542f0f0dc7fa91cfc76cb9cf6ac64a4663ffe 100644
--- a/src/components/AddMediaModal/index.tsx
+++ b/src/components/AddMediaModal/index.tsx
@@ -1,5 +1,6 @@
 import { Dispatch, connect } from 'react-redux'
 import React from 'react'
+import parseTorrent from 'parse-torrent'
 
 import Button from '../common/Button'
 import Input from '../common/Input'
@@ -14,6 +15,7 @@ type Props = {
 
 const AddMediaModal = (props: Props) => {
   const [magnetLink, setMagnetLink] = React.useState('')
+  const [torrent, setTorrent] = React.useState<File>()
   const [youtubeLink, setYoutubeLink] = React.useState('')
   const [ipfsHash, setIpfsHash] = React.useState('')
 
@@ -36,11 +38,25 @@ const AddMediaModal = (props: Props) => {
           value={magnetLink}
           onChange={(event) => setMagnetLink(event.target.value)}
         />
+        <input type="file" name="file" onChange={(event) => event.target.files && setTorrent(event.target.files[0])}/>
         <Button
           fullWidth
           type='submit'
           onClick={() => {
-            props.dispatch({type: types.ADD_WEBTORRENT_MEDIA, magnet: magnetLink})
+            if (magnetLink !== '') {
+              props.dispatch({type: types.ADD_WEBTORRENT_MEDIA, magnet: magnetLink})
+            }
+            if (torrent) {
+              console.log('torrent: ', torrent)
+              // console.log('parsed torrent: ', parseTorrent.remote(torrent))
+              parseTorrent.remote(torrent, (err, parsedTorrent) => {
+                if (err) throw err
+                if (!parsedTorrent) return
+
+                const magnet = parseTorrent.toMagnetURI(parsedTorrent)
+                props.dispatch({type: types.ADD_WEBTORRENT_MEDIA, magnet: magnet})
+              })
+            }
             props.dispatch({type: types.HIDE_ADD_MEDIA_MODAL})
           }}
         >
diff --git a/src/components/Player/CustomPlayers/WebtorrentPlayer.tsx b/src/components/Player/CustomPlayers/WebtorrentPlayer.tsx
index 1305a87bb57f211a09ffd1b10a8f5a90021267a5..5e34e2ab6ecf93c757961e794f13fba6ad9184eb 100644
--- a/src/components/Player/CustomPlayers/WebtorrentPlayer.tsx
+++ b/src/components/Player/CustomPlayers/WebtorrentPlayer.tsx
@@ -3,15 +3,13 @@ import { ReactPlayerProps } from 'react-player'
 import Webtorrent from 'webtorrent'
 
 const announceList = [
+  ['wss://tracker.btorrent.xyz'],
   ['udp://tracker.openbittorrent.com:80'],
   ['udp://tracker.internetwarriors.net:1337'],
   ['udp://tracker.leechers-paradise.org:6969'],
   ['udp://tracker.coppersurfer.tk:6969'],
   ['udp://exodus.desync.com:6969'],
-  ['wss://tracker.webtorrent.io'],
-  ['wss://tracker.btorrent.xyz'],
   ['wss://tracker.openwebtorrent.com'],
-  ['wss://tracker.fastcast.nz']
 ]
 
 function canPlay (url: string) {
@@ -76,23 +74,23 @@ export class TorrentPlayer extends React.Component<ReactPlayerProps> {
   }
 
   onSeek = (e: any) => {
-      if (this.props.onSeek == undefined) return;
-      this.props.onSeek(e.target.currentTime)
+    if (this.props.onSeek === undefined) return;
+    this.props.onSeek(e.target.currentTime)
   }
 
   play () {
-      const promise = this.player.play()
-      if (promise) {
-        promise.catch(this.props.onError)
-      }
+    const promise = this.player.play()
+    if (promise) {
+      promise.catch(this.props.onError)
+    }
   }
 
   pause () {
-      this.player.pause()
+    this.player.pause()
   }
 
   stop () {
-      this.player.removeAttribute('src')
+    this.player.removeAttribute('src')
   }
 
   seekTo (seconds: any) {
@@ -158,7 +156,8 @@ export class TorrentPlayer extends React.Component<ReactPlayerProps> {
       announce: announceList
     }, (torrent: any) => {
       const file = torrent.files.find((file: any) => {
-          return file.name.endsWith('.mp4')
+        // FIXME: Add other file extensions
+        return file.name.endsWith('.mp4')
       })
 
       if (file === undefined) return
diff --git a/src/components/Player/PlayerControls.tsx b/src/components/Player/PlayerControls.tsx
index 320bf47641bff33185f6d77df1048827db1b9a18..3ec9fde9d042fee257167c5c71bab86508e1c718 100644
--- a/src/components/Player/PlayerControls.tsx
+++ b/src/components/Player/PlayerControls.tsx
@@ -101,6 +101,7 @@ class PlayerControls extends React.Component<Props> {
   }
 
   onError = (e: Error) => {
+    console.log(e.message)
     this.props.dispatch({type: types.PLAY_ERROR, error: e})
   }
 
@@ -121,6 +122,7 @@ class PlayerControls extends React.Component<Props> {
 
     const currentPlayingId = this.props.queue.currentPlaying
     const currentPlaying = this.props.collection.rows[currentPlayingId]
+
     const { streamUri } = this.props.player
 
     const handlers = (
@@ -161,7 +163,7 @@ class PlayerControls extends React.Component<Props> {
           <InPortal node={this.props.playerPortal}>
             <ReactPlayer
               pip
-              fullscreen={this.props.player.fullscreen}
+              fullscreen={this.props.player.fullscreen.toString()}
               controls={songFinder && currentPlaying.media_type === 'video'}
               className={playerClassnames}
               ref={this.playerRef}
diff --git a/src/containers/LayoutContainer.tsx b/src/containers/LayoutContainer.tsx
index 933b98e31a9a3515505c191c81bb3f9591a0fbb7..4ae203b105aefd7ab3fdc02fa77fff7b10c98922 100644
--- a/src/containers/LayoutContainer.tsx
+++ b/src/containers/LayoutContainer.tsx
@@ -7,7 +7,21 @@ import SearchButton from '../components/Buttons/SearchButton'
 import Placeholder from '../components/Player/Placeholder'
 import Icon from '../components/common/Icon'
 
-const dynamicTitle = (router, collection, searchTerm: ''): string | React.ReactNode => {
+type TitleRouter = {
+  location: {
+    pathname: string
+  }
+}
+
+type TitleCollection = {
+  rows: any
+}
+
+const dynamicTitle = (
+  router: TitleRouter,
+  collection: TitleCollection,
+  searchTerm: ''
+): string | React.ReactNode => {
   const songFinder = router.location.pathname.match(/\/song\/(.*)/)
   const artistFinder = router.location.pathname.match(/\/artist\/(.*)/)
   const albumFinder = router.location.pathname.match(/\/album\/(.*)/)
diff --git a/src/entities/Media.ts b/src/entities/Media.ts
index 83690455478107dfa2a8343dbac233849e63adce..ed696d9be3036a57e85da7ef18e19caef1602912 100644
--- a/src/entities/Media.ts
+++ b/src/entities/Media.ts
@@ -217,7 +217,7 @@ export default class Media {
       playCount: this.playCount,
       filePath: this.filePath,
       media_type: this.media_type,
-      duration: this.duration,
+      duration: this.duration
     }
   }
 
diff --git a/src/sagas/player/index.ts b/src/sagas/player/index.ts
index 8114061e02bf47dfb208589828165d891e749c49..15c74573f9bb6bf9aa7fabba3e9bf9595bc0c54b 100644
--- a/src/sagas/player/index.ts
+++ b/src/sagas/player/index.ts
@@ -62,13 +62,17 @@ export function* handleError(): any {
 export function* handlePlayNext(): any {
   const queue = yield select(getQueue)
   const songId = queue.nextSongId
-  yield put({type: types.SET_CURRENT_PLAYING, songId})
+  if (songId) {
+    yield put({type: types.SET_CURRENT_PLAYING, songId})
+  }
 }
 
 export function* handlePlayPrev(): any {
   const queue = yield select(getQueue)
   const songId = queue.prevSongId
-  yield put({type: types.SET_CURRENT_PLAYING, songId})
+  if (songId) {
+    yield put({type: types.SET_CURRENT_PLAYING, songId})
+  }
 }
 
 export function* goToViewPage(): any {
diff --git a/src/sagas/webtorrent/index.ts b/src/sagas/webtorrent/index.ts
index 490abb12eff55d7b190f18566f975b0d1969d204..01820176c7c4c093d2af7d9403a06afeaf0aadfd 100644
--- a/src/sagas/webtorrent/index.ts
+++ b/src/sagas/webtorrent/index.ts
@@ -1,7 +1,7 @@
 // Binding actions to sagas
 import { takeLatest } from 'redux-saga/effects'
 import * as types from '../../constants/ActionTypes'
-import { readWebtorrentFile, } from './workers'
+import { readWebtorrentFile } from './workers'
 
 function* webtorrentSaga(): any {
   yield takeLatest(types.ADD_WEBTORRENT_MEDIA, readWebtorrentFile)
diff --git a/src/sagas/webtorrent/workers.ts b/src/sagas/webtorrent/workers.ts
index 3c725111609457f8629e8292b0a0ee65c83feccf..2fe391a746bc706046c374a019cf4abd48839871 100644
--- a/src/sagas/webtorrent/workers.ts
+++ b/src/sagas/webtorrent/workers.ts
@@ -3,14 +3,16 @@ import { put, call } from 'redux-saga/effects'
 import { getAdapter } from '../../services/database'
 import { magnetToMedia } from '../../services/Webtorrent'
 import CollectionService from '../../services/CollectionService'
-import Media from '../../entities/Media'
 import * as types from '../../constants/ActionTypes'
 
-export function* readWebtorrentFile(action: {magnet: string}) {
+export function* readWebtorrentFile(action: any) {
+  console.log('getting media objects from magnet: ', action.magnet)
   const medias = yield call(magnetToMedia, action.magnet)
   const adapter = getAdapter()
   const collectionService = new CollectionService(new adapter())
 
+  console.log('medias: ', medias)
+
   // Save song
   for (let i = 0; i < medias.length; i++) {
     const media = medias[i].toDocument()
diff --git a/src/services/MediaSessionService.ts b/src/services/MediaSessionService.ts
index 3416a3cb797a48ceea6a832b926d1c216461f1cd..edff711121a271265399d048f3dd685e0c60e654 100644
--- a/src/services/MediaSessionService.ts
+++ b/src/services/MediaSessionService.ts
@@ -8,11 +8,11 @@ declare var window: any
 
 export default class MediaSessionService {
   updateMetadata = (media: Media, dispatch: any) => {
-    if (this.canSetMediaSession()) {
+    if (this.canSetMediaSession() && media) {
       navigator.mediaSession.metadata = new window.MediaMetadata({
         title: media.title,
-        artist: media.artist.name,
-        album: media.album.name,
+        artist: media.artistName,
+        album: media.albumName,
         artwork: [
           {
             src: this.getThumbnail(media), type: 'image/png', sizes: '96x96'
diff --git a/src/services/Webtorrent/index.ts b/src/services/Webtorrent/index.ts
index 6b3617779552a478b47a25500f60f629d017216c..f4b95c30a7c70c6a5e342868357d86ef7a0ff19c 100644
--- a/src/services/Webtorrent/index.ts
+++ b/src/services/Webtorrent/index.ts
@@ -3,15 +3,13 @@ import Webtorrent from 'webtorrent'
 import Media from '../../entities/Media'
 
 const announceList = [
+  ['wss://tracker.btorrent.xyz'],
   ['udp://tracker.openbittorrent.com:80'],
   ['udp://tracker.internetwarriors.net:1337'],
   ['udp://tracker.leechers-paradise.org:6969'],
   ['udp://tracker.coppersurfer.tk:6969'],
   ['udp://exodus.desync.com:6969'],
-  ['wss://tracker.webtorrent.io'],
-  ['wss://tracker.btorrent.xyz'],
   ['wss://tracker.openwebtorrent.com'],
-  ['wss://tracker.fastcast.nz']
 ]
 
 export const magnetToMedia = async (torrentUrl: string): Promise<Array<Media>> => {
@@ -19,12 +17,13 @@ export const magnetToMedia = async (torrentUrl: string): Promise<Array<Media>> =
 
   return new Promise((resolve): any => {
     console.log('adding: ', torrentUrl)
+
     client.add(torrentUrl, {
       announce: announceList
     }, (torrent: any) => {
       console.log('files detected: ', torrent.files)
       const files = torrent.files.filter((file: any) => {
-        return file.name.endsWith('.mp4') || file.name.endsWith('.mp3')
+        return file.name.endsWith('.mp4') || file.name.endsWith('.mp3') || file.name.endsWith('.mkv')
       })
 
       const medias = files.map((file: any) => {
diff --git a/src/services/database/PouchdbAdapter.ts b/src/services/database/PouchdbAdapter.ts
index 656eb7c1dc80686744ffd7dc974a80840142b723..ee949a0a1d68c895e71325b0f564811df1c83bf5 100644
--- a/src/services/database/PouchdbAdapter.ts
+++ b/src/services/database/PouchdbAdapter.ts
@@ -66,7 +66,7 @@ export default class PouchdbAdapter implements IAdapter {
   getDocObj = async (model: string, id: string): Promise<any> => {
     const instance = await db.get()
 
-    return instance.get(id)
+    return instance.get(id, {attachments: true})
   }
 
   removeCollection = async (model: string): Promise<any> => {
@@ -78,11 +78,12 @@ export default class PouchdbAdapter implements IAdapter {
     return new Promise((resolve, reject) => {
       return db.get().then(async (instance) => {
 
+        logger.log('RxdbDatabase', 'Querying all database')
         const result = await instance.query((doc: any, emit: any) => {
           if (doc.type === model) {
             emit(doc)
           }
-        }, {type: model})
+        }, {type: model}, {attachments: true})
 
         if (result) {
           // FIXME: This elem.key should be elem.value maybe?