diff --git a/autoProcess/autoProcessComics.py b/autoProcess/autoProcessComics.py
index 72c06efb..1aac0219 100644
--- a/autoProcess/autoProcessComics.py
+++ b/autoProcess/autoProcessComics.py
@@ -67,7 +67,7 @@ def processEpisode(dirName, nzbName=None, status=0, inputCategory=None):
         watch_dir = ""
     params = {}
 
-    nzbName, dirName = converto_to_ascii(nzbName, dirName)
+    nzbName, dirName = convert_to_ascii(nzbName, dirName)
 
     if dirName == "Manual Run" and watch_dir != "":
         dirName = watch_dir
diff --git a/autoProcess/autoProcessGames.py b/autoProcess/autoProcessGames.py
index 9fd6a082..f29c965a 100644
--- a/autoProcess/autoProcessGames.py
+++ b/autoProcess/autoProcessGames.py
@@ -51,7 +51,7 @@ def process(dirName, nzbName=None, status=0, inputCategory=None):
     else:
         protocol = "http://"
 
-    nzbName, dirName = converto_to_ascii(nzbName, dirName)
+    nzbName, dirName = convert_to_ascii(nzbName, dirName)
 
     baseURL = protocol + host + ":" + port + web_root + "/api?api_key=" + apikey + "&mode="
 
diff --git a/autoProcess/autoProcessMovie.py b/autoProcess/autoProcessMovie.py
index db11e7a8..52bdd94b 100644
--- a/autoProcess/autoProcessMovie.py
+++ b/autoProcess/autoProcessMovie.py
@@ -188,22 +188,22 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
     method = config.get(section, "method")
     delete_failed = int(config.get(section, "delete_failed"))
     wait_for = int(config.get(section, "wait_for"))
-
+    try:
+        TimePerGiB = int(config.get(section, "TimePerGiB"))
+    except (ConfigParser.NoOptionError, ValueError):
+        TimePerGiB = 60 # note, if using Network to transfer on 100Mbit LAN, expect ~ 600 MB/minute.
     try:
         ssl = int(config.get(section, "ssl"))
     except (ConfigParser.NoOptionError, ValueError):
         ssl = 0
-
     try:
         web_root = config.get(section, "web_root")
     except ConfigParser.NoOptionError:
         web_root = ""
-        
     try:    
         transcode = int(config.get("Transcoder", "transcode"))
     except (ConfigParser.NoOptionError, ValueError):
         transcode = 0
-
     try:
         remoteCPS = int(config.get(section, "remoteCPS"))
     except (ConfigParser.NoOptionError, ValueError):
@@ -226,10 +226,7 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
     movie_id, imdbid, download_id, initial_status, initial_release_status = get_movie_info(baseURL, imdbid, download_id) # get the CPS database movie id for this movie.
     
     process_all_exceptions(nzbName.lower(), dirName)
-    nzbName, dirName = converto_to_ascii(nzbName, dirName)
-
-    TimeOut2 = int(wait_for) * 60 # If transfering files across directories, it now appears CouchPotato can take a while to confirm this url request... Try using wait_for timing.
-    socket.setdefaulttimeout(int(TimeOut2)) #initialize socket timeout. We may now be able to remove the delays from the wait_for section below?
+    nzbName, dirName = convert_to_ascii(nzbName, dirName)
 
     if status == 0:
         if transcode == 1:
@@ -249,6 +246,11 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
                 else:
                     command = command + "/?media_folder=" + urllib.quote(dirName) + "&downloader=" + clientAgent + "&download_id=" + download_id
 
+        dirSize = getDirectorySize(dirName) # get total directory size to calculate needed processing time.
+        TimeOut2 = int(TimePerGiB) * dirSize # Couchpotato needs to complete all moving and renaming before returning the status.
+        TimeOut2 += 60 # Add an extra minute for over-head/processing/metadata.
+        socket.setdefaulttimeout(int(TimeOut2)) #initialize socket timeout. We may now be able to remove the delays from the wait_for section below? If true, this should exit on first loop.
+
         url = baseURL + command
 
         Logger.info("Waiting for %s seconds to allow CPS to process newly extracted files", str(delay))
diff --git a/autoProcess/autoProcessMusic.py b/autoProcess/autoProcessMusic.py
index ce5d2e84..62ee7a15 100644
--- a/autoProcess/autoProcessMusic.py
+++ b/autoProcess/autoProcessMusic.py
@@ -13,7 +13,6 @@ from nzbToMediaEnv import *
 from nzbToMediaUtil import *
 
 Logger = logging.getLogger()
-socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
 
 def process(dirName, nzbName=None, status=0, inputCategory=None):
 
@@ -36,17 +35,18 @@ def process(dirName, nzbName=None, status=0, inputCategory=None):
     port = config.get(section, "port")
     apikey = config.get(section, "apikey")
     delay = float(config.get(section, "delay"))
-
     try:
         ssl = int(config.get(section, "ssl"))
     except (ConfigParser.NoOptionError, ValueError):
         ssl = 0
-
     try:
         web_root = config.get(section, "web_root")
     except ConfigParser.NoOptionError:
         web_root = ""
-
+    try:
+        TimePerGiB = int(config.get(section, "TimePerGiB"))
+    except (ConfigParser.NoOptionError, ValueError):
+        TimePerGiB = 60 # note, if using Network to transfer on 100Mbit LAN, expect ~ 600 MB/minute.
     if ssl:
         protocol = "https://"
     else:
@@ -55,7 +55,12 @@ def process(dirName, nzbName=None, status=0, inputCategory=None):
     if nzbName == "Manual Run":
         delay = 0
 
-    nzbName, dirName = converto_to_ascii(nzbName, dirName)
+    nzbName, dirName = convert_to_ascii(nzbName, dirName)
+
+    dirSize = getDirectorySize(dirName) # get total directory size to calculate needed processing time.
+    TimeOut = int(TimePerGiB) * dirSize # HeadPhones needs to complete all moving/transcoding and renaming before returning the status.
+    TimeOut += 60 # Add an extra minute for over-head/processing/metadata.
+    socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
 
     baseURL = protocol + host + ":" + port + web_root + "/api?apikey=" + apikey + "&cmd="
 
diff --git a/autoProcess/autoProcessTV.py b/autoProcess/autoProcessTV.py
index 5cb8bcc4..abe4996b 100644
--- a/autoProcess/autoProcessTV.py
+++ b/autoProcess/autoProcessTV.py
@@ -87,7 +87,7 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
     try:
         TimePerGiB = int(config.get(section, "TimePerGiB"))
     except (ConfigParser.NoOptionError, ValueError):
-        TimePerGiB = 1 # note, if using Network to transfer on 100Mbit LAN, expect ~ 600 MB/minute.
+        TimePerGiB = 60 # note, if using Network to transfer on 100Mbit LAN, expect ~ 600 MB/minute.
     try:
         SampleIDs = (config.get("Extensions", "SampleIDs")).split(',')
     except (ConfigParser.NoOptionError, ValueError):
@@ -119,7 +119,7 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
 
     if nzbName != "Manual Run" and (not fork in SICKBEARD_TORRENT or (clientAgent in ['nzbget','sabnzbd'] and not nzbExtractionBy == "Destination")):
         process_all_exceptions(nzbName.lower(), dirName)
-        nzbName, dirName = converto_to_ascii(nzbName, dirName)
+        nzbName, dirName = convert_to_ascii(nzbName, dirName)
 
         # Now check if movie files exist in destination. Eventually extraction may be done here if nzbExtractionBy == TorrentToMedia
         video = int(0)
@@ -144,7 +144,7 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
         dirName = watch_dir
 
     dirSize = getDirectorySize(dirName) # get total directory size to calculate needed processing time.
-    TimeOut = 60 * int(TimePerGiB) * dirSize # SickBeard needs to complete all moving and renaming before returning the log sequence via url.
+    TimeOut = int(TimePerGiB) * dirSize # SickBeard needs to complete all moving and renaming before returning the log sequence via url.
     TimeOut += 60 # Add an extra minute for over-head/processing/metadata.
     socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
 
diff --git a/autoProcess/migratecfg.py b/autoProcess/migratecfg.py
index 8b260f69..7fce8334 100644
--- a/autoProcess/migratecfg.py
+++ b/autoProcess/migratecfg.py
@@ -296,8 +296,8 @@ def addnzbget():
     confignew.read(configFilenamenew)
 
     section = "CouchPotato"
-    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS', 'WAIT_FOR']
-    cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS', 'wait_for']
+    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS', 'WAIT_FOR', 'TIMEPERGIB']
+    cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS', 'wait_for', 'TimePerGiB']
     for index in range(len(envKeys)):
         key = 'NZBPO_CPS' + envKeys[index]
         if os.environ.has_key(key):
@@ -317,8 +317,8 @@ def addnzbget():
             confignew.set(section, option, value)
 
     section = "HeadPhones"
-    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY']
-    cfgKeys = ['hpCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay']
+    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'TIMEPERGIB']
+    cfgKeys = ['hpCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'TimePerGiB']
     for index in range(len(envKeys)):
         key = 'NZBPO_HP' + envKeys[index]
         if os.environ.has_key(key):
diff --git a/autoProcess/nzbToMediaUtil.py b/autoProcess/nzbToMediaUtil.py
index 9c565d9e..2af20513 100644
--- a/autoProcess/nzbToMediaUtil.py
+++ b/autoProcess/nzbToMediaUtil.py
@@ -354,7 +354,7 @@ def WakeUp():
     else:
         Logger.info("System with mac: %s has been woken. Continuing with the rest of the script.", mac)
 
-def converto_to_ascii(nzbName, dirName):
+def convert_to_ascii(nzbName, dirName):
     config = ConfigParser.ConfigParser()
     configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
     if not os.path.isfile(configFilename):
diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index f0723e73..97731862 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -12,9 +12,10 @@ port = 5050
 ssl = 0
 web_root =
 delay = 65
+TimePerGiB = 60
 method = renamer
 delete_failed = 0
-wait_for = 5
+wait_for = 2
 #### Set to 1 if CouchPotatoServer is running on a different server to your NZB client
 remoteCPS = 0
 
@@ -31,7 +32,7 @@ password =
 web_root =
 ssl = 0
 delay = 0
-TimePerGiB = 1
+TimePerGiB = 60
 watch_dir =
 fork = auto
 delete_failed = 0
@@ -51,6 +52,7 @@ port = 8181
 ssl = 0
 web_root =
 delay = 65
+TimePerGiB = 60
 
 
 [Mylar]
diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
index d1cb87dd..ece21647 100755
--- a/nzbToCouchPotato.py
+++ b/nzbToCouchPotato.py
@@ -53,10 +53,15 @@
 # set to 1 to delete failed, or 0 to leave files in place.
 #cpsdelete_failed=0
 
+# CouchPotato process Time Per GiB
+#
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#cpsTimePerGiB=60
+
 # CouchPotato wait_for
 #
-# Set the number of minutes to wait before timing out. If transfering files across drives or network, increase this to longer than the time it takes to copy a movie.
-#cpswait_for=5
+# Set the number of minutes to wait after calling the renamer, to check the movie has changed status.
+#cpswait_for=2
 
 # CouchPotatoServer and NZBGet are a different system (0, 1).
 #
diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py
index c641b9f1..992a5f47 100755
--- a/nzbToHeadPhones.py
+++ b/nzbToHeadPhones.py
@@ -43,6 +43,11 @@
 # set as required to ensure correct processing.
 #hpdelay=65
 
+# HeadPhones process Time Per GiB
+#
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#hpTimePerGiB=60
+
 ## WakeOnLan
 
 # use WOL (0, 1).
diff --git a/nzbToMedia.py b/nzbToMedia.py
index d68afc8d..232273ca 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -53,10 +53,15 @@
 # set to 1 to delete failed, or 0 to leave files in place.
 #cpsdelete_failed=0
 
+# CouchPotato process Time Per GiB
+#
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#cpsTimePerGiB=60
+
 # CouchPotato wait_for
 #
-# Set the number of minutes to wait before timing out. If transfering files across drives or network, increase this to longer than the time it takes to copy a movie.
-#cpswait_for=5
+# Set the number of minutes to wait after calling the renamer, to check the movie has changed status.
+#cpswait_for=2
 
 # CouchPotatoServer and NZBGet are a different system (0, 1).
 #
@@ -99,8 +104,8 @@
 
 # SickBeard process Time Per GiB
 #
-# Set the number of minutes to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
-#sbTimePerGiB=1
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#sbTimePerGiB=60
 
 # SickBeard watch directory.
 #
@@ -153,6 +158,11 @@
 # set as required to ensure correct processing.
 #hpdelay=65
 
+# HeadPhones process Time Per GiB
+#
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#hpTimePerGiB=60
+
 ## Mylar
 
 # Mylar script category.
diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index 03892680..e88890c5 100755
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -48,8 +48,8 @@
 
 # SickBeard process Time Per GiB
 #
-# Set the number of minutes to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
-#sbTimePerGiB=1
+# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
+#sbTimePerGiB=60
 
 # SickBeard watch directory.
 #