diff --git a/core/autoplay.py b/core/autoplay.py
index dd5ea8f6..a35cb592 100644
--- a/core/autoplay.py
+++ b/core/autoplay.py
@@ -41,7 +41,7 @@ def start(itemlist, item):
 
     import xbmc
     control_item = Item().fromurl(xbmc.getInfoLabel('Container.FolderPath'))
-    if control_item == item:
+    if control_item.action == item.action:
         return itemlist
 
     if config.get_setting('autoplay') or item.autoplay:
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index b90d8309..6d1c2022 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -13,7 +13,7 @@ if sys.version_info[0] >= 3:PY3 = True; unicode = str; unichr = chr; long = int
 
 from core.item import Item
 from core import filetools, jsontools
-from platformcode import config, logger, platformtools
+from platformcode import config, logger, platformtools, xbmc_videolibrary
 from platformcode.logger import WebErrorException
 temp_search_file = config.get_temp_file('temp-search')
 
@@ -445,25 +445,37 @@ def play_from_library(item):
     """
 
     def get_played_time(item):
-        if item.contentType == 'movie': nfo_path = item.nfo
-        else: nfo_path = item.strm_path.replace('strm','nfo')
+        from core import videolibrarytools
+
+        if item.contentType == 'movie':
+            nfo_path = item.nfo
+            if nfo_path.startswith('\\') or nfo_path.startswith('/'):
+                nfo_path = filetools.join(videolibrarytools.MOVIES_PATH, nfo_path)
+
+        else:
+            nfo_path =item.strm_path.replace('strm','nfo')
+            if nfo_path.startswith('\\') or nfo_path.startswith('/'):
+                nfo_path = filetools.join(videolibrarytools.TVSHOWS_PATH, nfo_path)
+
         if nfo_path and filetools.isfile(nfo_path):
-            from core import videolibrarytools
             head_nfo, item_nfo = videolibrarytools.read_nfo(nfo_path)
             sleep(1)
             played_time = platformtools.get_played_time(item_nfo)
+
         else: played_time = 0
+
         return played_time
 
     import xbmcgui, xbmcplugin, xbmc
     from time import sleep
 
     # logger.debug("item: \n" + item.tostring('\n'))
-    xbmcplugin.setResolvedUrl(int(sys.argv[1]), True,
-                              xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4")))
-    while not platformtools.is_playing():
-        xbmc.sleep(10)
-    xbmc.Player().stop()
+    # xbmc.Player().play(os.path.join(config.get_runtime_path(), "resources", "kod.mp4"))
+    if not item.autoplay:
+        xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4")))
+        while not platformtools.is_playing():
+            xbmc.sleep(10)
+        xbmc.Player().stop()
     platformtools.prevent_busy()
 
 
@@ -474,8 +486,10 @@ def play_from_library(item):
 
     # Modify the action (currently the video library needs "findvideos" since this is where the sources are searched
     item.action = item.next_action if item.next_action else "findvideos"
-
-    window_type = config.get_setting("window_type", "videolibrary") if config.get_setting('next_ep') < 3 and item.contentType != 'movie' else 1
+    # from core.support import dbg;dbg()
+    if item.contentType == 'movie' or item.contentType != 'movie' and config.get_setting('next_ep') < 3:
+        window_type = config.get_setting("window_type", "videolibrary")
+    else: window_type = 1
 
     # and launch kodi again
     if (xbmc.getCondVisibility('Window.IsMedia') and not window_type == 1) or item.action != 'findvideos':
@@ -496,10 +510,10 @@ def play_from_library(item):
         if config.get_setting("max_links", "videolibrary") != 0: itemlist = limit_itemlist(itemlist)
         # The list of links is slightly "cleaned"
         if config.get_setting("replace_VD", "videolibrary") == 1: itemlist = reorder_itemlist(itemlist)
-        # from core.support import dbg;dbg()
+
         if len(itemlist) > 0:
             reopen = False
-            # from core.support import dbg;dbg()
+
             while not xbmc.Monitor().abortRequested():
                 played = True
                 # if config.get_setting('next_ep') == 3 and xbmc.Player().playnext:
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 9b2a809f..802b8af2 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -1506,9 +1506,13 @@ def play_torrent(item, xlistitem, mediaurl):
             torrent.elementum_download(item)
         else:
             # time.sleep(3)
-            if item.fromLibrary:
+            # from core.support import dbg;dbg()
+            if item.fromLibrary and item.play_from == 'window':
                 xlistitem.setPath(torrent_options[selection][1] % mediaurl)
-                xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
+                playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
+                playlist.clear()
+                playlist.add(torrent_options[selection][1] % mediaurl, xlistitem)
+                xbmc_player.play(playlist, xlistitem)
             else:
                 xbmc.executebuiltin("PlayMedia(" + torrent_options[selection][1] % mediaurl + ")")
 
diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index a78ed16c..c8cc3b49 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -100,10 +100,10 @@ def mark_auto_as_watched(item):
             xbmc.sleep(700)
             xbmc.executebuiltin('Action(ParentDir)')
             xbmc.sleep(500)
-
+        # from core.support import dbg;dbg()
         if next_episode and next_episode.next_ep and config.get_setting('next_ep') < 3:
-            from platformcode.launcher import play_from_library
-            play_from_library(next_episode)
+            from platformcode.launcher import run
+            run(next_episode)
 
         # db need to be closed when not used, it will cause freezes
         from core import db