diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index a16ee104..a239ff87 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -37,7 +37,8 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
             "We could not find a section with containing a download category labeled %s in your autoProcessMedia.cfg, Exiting!" % inputCategory)
         return -1
 
-    Torrent_NoLink = int(nzbtomedia.CFG[section][inputCategory]["Torrent_NoLink"]) or 0
+    try:Torrent_NoLink = int(nzbtomedia.CFG[section][inputCategory]["Torrent_NoLink"])
+    except:Torrent_NoLink = 0
 
     if clientAgent != 'manual':
         pause_torrent(clientAgent, inputHash, inputID, inputName)
diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py
index d8d28cf8..2b120c54 100644
--- a/nzbtomedia/__init__.py
+++ b/nzbtomedia/__init__.py
@@ -9,6 +9,7 @@ SYS_ARGV = sys.argv[1:]
 APP_FILENAME = sys.argv[0]
 APP_NAME = os.path.basename(APP_FILENAME)
 PROGRAM_DIR = os.path.dirname(os.path.normpath(os.path.abspath(os.path.join(__file__, os.pardir))))
+LIBS_DIR = os.path.join(PROGRAM_DIR, 'lib')
 LOG_DIR = os.path.join(PROGRAM_DIR, 'logs')
 LOG_FILE = os.path.join(LOG_DIR, 'postprocess.log')
 CONFIG_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg')
@@ -17,7 +18,7 @@ CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg')
 CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg')
 
 # add our custom libs to the system path
-sys.path.insert(0, os.path.abspath(os.path.join(PROGRAM_DIR, 'lib')))
+sys.path.insert(0, LIBS_DIR)
 
 from nzbtomedia import logger, versionCheck
 from nzbtomedia.nzbToMediaConfig import config
diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py
index 04548ed1..cbd1d485 100644
--- a/nzbtomedia/autoProcess/autoProcessMovie.py
+++ b/nzbtomedia/autoProcess/autoProcessMovie.py
@@ -130,9 +130,6 @@ class autoProcessMovie:
 
         imdbid = find_imdbid(dirName, nzbName)
         release = self.get_release(baseURL, imdbid, download_id)
-        #if not release:
-        #    logger.error('Unable to find %s in your wanted list, skipping ...' % (nzbName), section)
-        #    return 1
 
         # pull info from release found if available
         release_id = None
diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py
index ea99bec3..130744f2 100644
--- a/nzbtomedia/autoProcess/autoProcessTV.py
+++ b/nzbtomedia/autoProcess/autoProcessTV.py
@@ -56,10 +56,6 @@ class autoProcessTV:
             process_method = nzbtomedia.CFG[section][inputCategory]["process_method"]
         except:
             process_method = None
-        try:
-            Torrent_NoLink = int(nzbtomedia.CFG[section][inputCategory]["Torrent_NoLink"])
-        except:
-            Torrent_NoLink = 0
         try:
             remote_path = nzbtomedia.CFG[section][inputCategory]["remote_path"]
         except:
@@ -116,7 +112,7 @@ class autoProcessTV:
                     fork_params[param] = dirName_new
 
             if param == "process_method":
-                if fork in nzbtomedia.SICKBEARD_TORRENT and Torrent_NoLink == 1 and not clientAgent in ['nzbget','sabnzbd']: #use default SickBeard settings here.
+                if fork in nzbtomedia.SICKBEARD_TORRENT and not clientAgent in ['nzbget','sabnzbd']: #use default SickBeard settings here.
                     del fork_params[param]
                 if process_method:
                     fork_params[param] = process_method
diff --git a/nzbtomedia/nzbToMediaConfig.py b/nzbtomedia/nzbToMediaConfig.py
index 85fca5ad..594ea724 100644
--- a/nzbtomedia/nzbToMediaConfig.py
+++ b/nzbtomedia/nzbToMediaConfig.py
@@ -126,9 +126,6 @@ class ConfigObj(configobj.ConfigObj, Section):
                     if option == "failed_fork":  # change this old format
                         values['failed'] = 'auto'
                         values.pop(option)
-                    if option == "Torrent_ForceLink":
-                        values['Torrent_NoLink'] = value
-                        values.pop(option)
                     if option == "outputDirectory":  # move this to new location format
                         CFG_NEW['Torrent'][option] = os.path.split(os.path.normpath(value))[0]
                         values.pop(option)
diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py
index 07792e24..f60d5e1d 100644
--- a/nzbtomedia/nzbToMediaUtil.py
+++ b/nzbtomedia/nzbToMediaUtil.py
@@ -442,7 +442,7 @@ def cleanProcDirs():
             if nzbtomedia.CFG[section][category].isenabled():
                 dirNames = get_dirnames(section, category)
                 for dirName in dirNames:
-                    num_files = len(listMediaFiles(dirName, archives=False))
+                    num_files = len(listMediaFiles(dirName))
                     if num_files > 0:
                         logger.info(
                             "Directory %s still contains %s unprocessed file(s), skipping ..." % (dirName, num_files),
@@ -631,7 +631,7 @@ def find_imdbid(dirName, nzbName):
         return imdbid
 
     logger.info('Searching IMDB for imdbID ...')
-    guess = guessit.guess_video_info(dirName)
+    guess = guessit.guess_movie_info(nzbName)
     if guess:
         # Movie Title
         title = None