diff --git a/data/css/style.css b/data/css/style.css
index deacb929ff..967959eade 100644
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -9,13 +9,13 @@ browser.css
   margin: 0;
 }
 #fileBrowserDialog ul li {
-  padding: 4px 0;
-  margin: 2px;
+  margin: 2px 0;
   list-style-type: none;
   cursor: pointer;
 }
 #fileBrowserDialog ul li a {
   display: block;
+  padding: 4px 0;
 }
 #fileBrowserDialog ul li a:hover {
   color: #00f;
@@ -58,11 +58,9 @@ browser.css
 /* =======================================================================
 formWizard.css
 ========================================================================== */
-/* TODO: cleanup the fixed height issue with custom quality */
 fieldset.sectionwrap {
   width: 800px;
   padding: 5px;
-  overflow: auto;
   text-align: left;
   border-width: 0;
 }
@@ -78,7 +76,7 @@ div.stepsguide {
 }
 div.stepsguide .step {
   float: left;
-  width: 260px;
+  width: 250px;
   font: bold 24px Arial;
 }
 div.stepsguide .step p {
@@ -122,19 +120,15 @@ div.formpaginate .prev, div.formpaginate .next {
   overflow: hidden;
   clear: both;
 }
-.stepDiv > #customQualityWrapper {
-  height: 190px;
-  overflow: auto;
-}
 #customQualityWrapper div.component-group-desc {
-  float:left;
-  width:165px;
+  float: left;
+  width: 165px;
 }
 #customQualityWrapper div.component-group-desc p {
-  width:85%;
-  margin:.8em 0;
-  font-size:1.2em;
-  color:#666;
+  width: 85%;
+  margin: .8em 0;
+  font-size: 1.2em;
+  color: #666;
 }
 
 /* =======================================================================
@@ -362,7 +356,7 @@ home.tmpl
 /* =======================================================================
 home_postprocess.tmpl
 ========================================================================== */
-#episodeDir {
+#episodeDir, #newRootDir {
   margin-right: 6px;
 }
 
@@ -449,11 +443,6 @@ ul#rootDirStaticList li {
   list-style: none outside none;
   cursor: pointer;
 }
-/* for tabs: manage directories */
-#rootDirs, #rootDirsControls {
-  width: 50%;
-  min-width: 400px;
-}
 /* for tabs: customize options */
 #tabs div.field-pair,
 .stepDiv div.field-pair {
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index 9c5a9034b9..826cf0ad58 100755
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -26,6 +26,7 @@
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/xbmc.png" alt="" title="XBMC" />
                         <h3><a href="http://xbmc.org/" onclick="window.open(this.href, '_blank'); return false;">XBMC</a></h3>
                         <p>A free and open source cross-platform media center and home entertainment system software with a 10-foot user interface designed for the living-room TV.</p>
+                        <p>For SickBeard to communicate with XBMC you must turn on the <a href="http://wiki.xbmc.org/index.php?title=Webserver" onclick="window.open(this.href, '_blank'); return false;">XBMC Webserver</a>.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
@@ -55,14 +56,14 @@
                                 <input type="checkbox" name="xbmc_update_library" id="xbmc_update_library" #if $sickbeard.XBMC_UPDATE_LIBRARY then "checked=\"checked\"" else ""# />
                                 <label class="clearfix" for="xbmc_update_library">
                                     <span class="component-title">Update Library</span>
-                                    <span class="component-desc">Update XBMC library when we finish a download?</span>
+                                    <span class="component-desc">Update library (show's path) when we finish a download?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
                                 <input type="checkbox" name="xbmc_update_full" id="xbmc_update_full" #if $sickbeard.XBMC_UPDATE_FULL then "checked=\"checked\"" else ""# />
                                 <label class="clearfix" for="xbmc_update_full">
                                     <span class="component-title">Full Library Update</span>
-                                    <span class="component-desc">Do a full library update if per-show fails?</span>
+                                    <span class="component-desc">Fall back to a full library update if per-show fails?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
@@ -76,7 +77,7 @@
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">(multiple host strings can be separated by commas)</span>
+                                    <span class="component-desc">(multiple host strings must be separated by commas, <br/> the library updates will only be sent to the first host listed)</span>
                                 </label>
                             </div>
                             <div class="field-pair">
@@ -164,6 +165,10 @@
                                     <span class="component-title">&nbsp;</span>
                                     <span class="component-desc">Host running Plex Client (eg. 192.168.1.100:3000)</span>
                                 </label>
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">(multiple host strings must be separated by commas)</span>
+                                </label>
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
@@ -186,7 +191,7 @@
                                 </label>
                             </div>
                             <div class="testNotification" id="testPLEX-result">Click below to test.</div>
-                            <input type="button" class="btn" value="Test Plex Media Server" id="testPLEX" />
+                            <input type="button" class="btn" value="Test Plex Media Clients" id="testPLEX" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
                         </div><!-- /content_use_plex -->
 
@@ -458,7 +463,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Prowl priority:</span>
+                                    <span class="component-title">Prowl Priority:</span>
                                    <select id="prowl_priority" name="prowl_priority">
                                         <option value="-2" #if $sickbeard.PROWL_PRIORITY == "-2" then 'selected="selected"' else ""#>Very Low</option>
                                         <option value="-1" #if $sickbeard.PROWL_PRIORITY == "-1" then 'selected="selected"' else ""#>Moderate</option>
@@ -611,7 +616,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-title">Pushover User Key</span>
                                     <input type="text" name="pushover_userkey" id="pushover_userkey" value="$sickbeard.PUSHOVER_USERKEY" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
@@ -713,7 +718,7 @@
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Multiple keys must be seperated by a , (comma). Up to a maximum of 5</span>
+                                    <span class="component-desc">Multiple keys (maxium of 5) must be seperated by commas</span>
                                 </label>
                             </div>
                             <div class="field-pair">
diff --git a/data/interfaces/default/config_providers.tmpl b/data/interfaces/default/config_providers.tmpl
index f716455869..1f06f4535a 100755
--- a/data/interfaces/default/config_providers.tmpl
+++ b/data/interfaces/default/config_providers.tmpl
@@ -85,7 +85,7 @@
                                 <span class="component-title jumbo">Configure Provider:</span>
                                 <span class="component-desc">
                                     #set $provider_config_list = []
-                                    #for $cur_provider in ("nzbs_r_us", "newzbin", "nzbmatrix", "tvtorrents", "btn"):
+                                    #for $cur_provider in ("nzbs_r_us", "tvtorrents", "btn"):
                                         #set $cur_provider_obj = $sickbeard.providers.getProviderClass($cur_provider)
                                         #if $cur_provider_obj.providerType == $GenericProvider.NZB and not $sickbeard.USE_NZBS:
                                             #continue
@@ -126,51 +126,6 @@
                         </div>
                     </div><!-- /${curNewznabProvider.getID()}Div //-->
 #end for
-<!--
-                    <div class="providerDiv" id="nzbs_orgDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBs.org UID</span>
-                                <input class="component-desc" type="text" name="nzbs_org_uid" value="$sickbeard.NZBS_UID" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBs.org Hash</span>
-                                <input class="component-desc" type="text" name="nzbs_org_hash" value="$sickbeard.NZBS_HASH" size="40" />
-                            </label>
-                        </div>
-                    </div>
--->
-                    <div class="providerDiv" id="nzbmatrixDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBMatrix Username</span>
-                                <input class="component-desc" type="text" name="nzbmatrix_username" value="$sickbeard.NZBMATRIX_USERNAME" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">NZBMatrix API Key</span>
-                                <input class="component-desc" type="text" name="nzbmatrix_apikey" value="$sickbeard.NZBMATRIX_APIKEY" size="40" />
-                            </label>
-                        </div>
-                    </div><!-- /nzbmatrixDiv //-->
-
-                    <div class="providerDiv" id="newzbinDiv">
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">Newzbin Username</span>
-                                <input class="component-desc" type="text" name="newzbin_username" value="$sickbeard.NEWZBIN_USERNAME" size="10" />
-                            </label>
-                        </div>
-                        <div class="field-pair">
-                            <label class="clearfix">
-                                <span class="component-title">Newzbin Password</span>
-                                <input class="component-desc" type="password" name="newzbin_password" value="$sickbeard.NEWZBIN_PASSWORD" size="40" />
-                            </label>
-                        </div>
-                    </div><!-- /newzbinDiv //-->
 
                     <div class="providerDiv" id="nzbs_r_usDiv">
                         <div class="field-pair">
diff --git a/data/interfaces/default/editShow.tmpl b/data/interfaces/default/editShow.tmpl
index bbefe0a737..a0ce6dd7e7 100644
--- a/data/interfaces/default/editShow.tmpl
+++ b/data/interfaces/default/editShow.tmpl
@@ -1,20 +1,21 @@
 #import sickbeard
 #from sickbeard import common
 #from sickbeard import exceptions
-#set global $title="Edit "+$show.name
+#set global $title="Edit " + $show.name
 #set global $header=$show.name
 
 #set global $sbPath=".."
 
-#set global $topmenu="home"#
+#set global $topmenu="home"
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")
 
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){
 
-  \$.getJSON('$sbRoot/home/addShows/getTVDBLanguages', {}, function(data){
+  \$.getJSON('$sbRoot/home/addShows/getTVDBLanguages', {}, function(data) {
         var resultStr = '';
 
         if (data.results.length == 0) {
@@ -22,14 +23,14 @@
             resultStr = '<option value="$show.lang" selected="selected" + flag>$show.lang</option>';
         } else {
             var current_lang_added = false;
-            \$.each(data.results, function(index, obj){
+            \$.each(data.results, function(index, obj) {
 
                 if (obj == "$show.lang") {
-                        selected = ' selected="selected"';
-                        current_lang_added = true;
+                    selected = ' selected="selected"';
+                    current_lang_added = true;
                 }
                 else {
-                        selected = '';
+                    selected = '';
                 }
 
                 flag = ' class="flag" style="background-image:url($sbRoot/images/flags/' + obj + '.png);"';
@@ -41,7 +42,6 @@
         }
         \$('#tvdbLangSelect').html(resultStr)
 
-        \$('#tvdbLangSelect').change(function() { searchTvdb() });
   });
 
 });
diff --git a/data/interfaces/default/home.tmpl b/data/interfaces/default/home.tmpl
index c15ff19ea2..b6868d3696 100644
--- a/data/interfaces/default/home.tmpl
+++ b/data/interfaces/default/home.tmpl
@@ -57,11 +57,14 @@
 
         var nums = match[1].split(" / ");
 
+        if (parseInt(nums[0]) === 0)
+            return parseInt(nums[1]);
+
         var finalNum = parseInt((nums[0]/nums[1])*1000)*100;
         if (finalNum > 0)
             finalNum += parseInt(nums[0]);
 
-        return finalNum
+        return finalNum;
     },
     type: 'numeric'
 });
diff --git a/data/interfaces/default/home_addExistingShow.tmpl b/data/interfaces/default/home_addExistingShow.tmpl
index 30ccbe162b..38c4fc6d0f 100644
--- a/data/interfaces/default/home_addExistingShow.tmpl
+++ b/data/interfaces/default/home_addExistingShow.tmpl
@@ -1,5 +1,4 @@
 #import os.path
-#import urllib
 #import sickbeard
 #from sickbeard.common import *
 #set global $title="Existing Show"
@@ -13,6 +12,7 @@
 
 <form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8">
 
+<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/addExistingShow.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> 
diff --git a/data/interfaces/default/home_newShow.tmpl b/data/interfaces/default/home_newShow.tmpl
index 82ccff8954..fd475604da 100644
--- a/data/interfaces/default/home_newShow.tmpl
+++ b/data/interfaces/default/home_newShow.tmpl
@@ -1,5 +1,4 @@
 #import os.path
-#import urllib
 #import sickbeard
 #set global $title="New Show"
 
@@ -14,8 +13,8 @@
 <script type="text/javascript" src="$sbRoot/js/lib/formwizard.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/newShow.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script> 
-   
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js?$sbPID"></script>
+
 <div id="displayText">aoeu</div>
 <br />
 
@@ -36,13 +35,12 @@
                 <option value="en" selected="selected">en</option>
             </select><b>*</b>
             <input type="button" id="searchName" value="Search" class="btn" /><br /><br />
-    
+
             <b>*</b> This will only affect the language of the retrieved metadata file contents and episode filenames.<br />
             This <b>DOES NOT</b> allow Sick Beard to download non-english TV episodes!<br />
             <br />
-            <div id="searchResults" style="height: 225px; overflow: auto;"></div>
+            <div id="searchResults" style="max-height: 225px; overflow: auto;"><br/></div>
         #end if
-
     </div>
 </fieldset>
 
@@ -61,9 +59,10 @@
 
 <fieldset class="sectionwrap">
     <legend class="legendStep">Customize options</legend>
-        <div class="stepDiv">
-            #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_addShowOptions.tmpl")
-        </div>
+
+    <div class="stepDiv">
+        #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_addShowOptions.tmpl")
+    </div>
 </fieldset>
 
 #for $curNextDir in $other_shows:
diff --git a/data/interfaces/default/inc_qualityChooser.tmpl b/data/interfaces/default/inc_qualityChooser.tmpl
index 0babebab10..0f574fff3a 100644
--- a/data/interfaces/default/inc_qualityChooser.tmpl
+++ b/data/interfaces/default/inc_qualityChooser.tmpl
@@ -1,8 +1,6 @@
 #import sickbeard
 #from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
 
-<script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
-
 <div class="field-pair">
     <label for="qualityPreset" class="nocheck clearfix">
 #set $overall_quality = $Quality.combineQualities($anyQualities, $bestQualities)
@@ -21,11 +19,10 @@
 </div>
 
 <div id="customQualityWrapper">
-
-<div id="customQuality">
-    <div class="component-group-desc">
-        <p>One of the <b>Initial</b> quality selections must be obtained before Sick Beard will attempt to process the <b>Archive</b> selections.</p>
-    </div>
+    <div id="customQuality">
+        <div class="component-group-desc">
+            <p>One of the <b>Initial</b> quality selections must be obtained before Sick Beard will attempt to process the <b>Archive</b> selections.</p>
+        </div>
 
         <div style="padding-right: 40px; text-align: center;" class="float-left">
             <h4>Initial</h4>
diff --git a/data/interfaces/default/inc_rootDirs.tmpl b/data/interfaces/default/inc_rootDirs.tmpl
index 0052a314e1..27f995daab 100644
--- a/data/interfaces/default/inc_rootDirs.tmpl
+++ b/data/interfaces/default/inc_rootDirs.tmpl
@@ -3,7 +3,7 @@
 
 #if $sickbeard.ROOT_DIRS:
 #set $backend_pieces = $sickbeard.ROOT_DIRS.split('|')
-#set $backend_default = 'rd-'+$backend_pieces[0]
+#set $backend_default = 'rd-' + $backend_pieces[0]
 #set $backend_dirs = $backend_pieces[1:]
 #else:
 #set $backend_default = ''
@@ -11,14 +11,14 @@
 #end if
 
 <input type="hidden" id="whichDefaultRootDir" value="$backend_default" />
-<div style="padding-bottom: 5px; padding-top: 10px;">
-    <select name="rootDir" id="rootDirs" size="6" style="min-width: 400px;">
+<div style="padding: 10px 0 5px;">
+    <select name="rootDir" id="rootDirs" size="6" style="min-width: 500px;">
     #for $cur_dir in $backend_dirs:
         <option value="$cur_dir">$cur_dir</option>
     #end for
     </select>
 </div>
-<div id="rootDirsControls" style="text-align: center;">
+<div id="rootDirsControls" style="text-align: center; width: 500px;">
     <input class="btn" type="button" id="addRootDir" value="New" />
     <input class="btn" type="button" id="editRootDir" value="Edit" />
     <input class="btn" type="button" id="deleteRootDir" value="Delete" />
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index d897893676..f791be8977 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -24,7 +24,7 @@
 
 <style type="text/css">
 <!--
-#contentWrapper { background: url("$sbRoot/images/bg.png") repeat scroll 0 0 transparent; }
+#contentWrapper { background: url("$sbRoot/images/bg.png") repeat fixed 0 0 transparent; }
 
 [class^="icon-"], [class*=" icon-"] { background-image: url("$sbRoot/images/glyphicons-halflings.png"); }
 .icon-white { background-image: url("$sbRoot/images/glyphicons-halflings-white.png"); }
diff --git a/data/js/addShowOptions.js b/data/js/addShowOptions.js
index 5f2f2c9e9c..a97eee9b1b 100644
--- a/data/js/addShowOptions.js
+++ b/data/js/addShowOptions.js
@@ -1,23 +1,24 @@
-$(document).ready(function(){
+$(document).ready(function () {
 
-    $('#saveDefaultsButton').click(function() {
-        var anyQualArray = new Array();
-        var bestQualArray = new Array();
-        $('#anyQualities option:selected').each(function(i,d){anyQualArray.push($(d).val())});
-        $('#bestQualities option:selected').each(function(i,d){bestQualArray.push($(d).val())});
+    $('#saveDefaultsButton').click(function () {
+        var anyQualArray = [];
+        var bestQualArray = [];
+        $('#anyQualities option:selected').each(function (i, d) {anyQualArray.push($(d).val()); });
+        $('#bestQualities option:selected').each(function (i, d) {bestQualArray.push($(d).val()); });
 
-        $.get(sbRoot+'/config/general/saveAddShowDefaults', {defaultStatus: $('#statusSelect').val(),
+        $.get(sbRoot + '/config/general/saveAddShowDefaults', {defaultStatus: $('#statusSelect').val(),
                                                              anyQualities: anyQualArray.join(','),
                                                              bestQualities: bestQualArray.join(','),
-                                                             defaultFlattenFolders: $('#flatten_folders').prop('checked')} );
+                                                             defaultFlattenFolders: $('#flatten_folders').prop('checked')});
         $(this).attr('disabled', true);
         $.pnotify({
             pnotify_title: 'Saved Defaults',
-            pnotify_text: 'Your "add show" defaults have been set to your current selections.'
+            pnotify_text: 'Your "add show" defaults have been set to your current selections.',
+            pnotify_shadow: false
         });
     });
 
-    $('#statusSelect, #qualityPreset, #flatten_folders, #anyQualities, #bestQualities').change(function(){
+    $('#statusSelect, #qualityPreset, #flatten_folders, #anyQualities, #bestQualities').change(function () {
         $('#saveDefaultsButton').attr('disabled', false);
     });
 
diff --git a/data/js/configPostProcessing.js b/data/js/configPostProcessing.js
index 5cdd43aa0d..81e7e818f6 100644
--- a/data/js/configPostProcessing.js
+++ b/data/js/configPostProcessing.js
@@ -45,7 +45,7 @@ $(document).ready(function () {
                 } else if (data == "seasonfolders") {
                     $('#naming_pattern').qtip('option', {
                         'content.text': 'This pattern would be invalid without the folders, using it will force "Flatten" off for all shows.',
-                        'style.classes': 'ui-tooltip-rounded ui-tooltip-shadow ui-tooltip-red'
+                        'style.classes': 'ui-tooltip-rounded ui-tooltip-shadow ui-tooltip-cream'
                     });
                     $('#naming_pattern').qtip('toggle', true);
                     $('#naming_pattern').css('background-color', '#FFFFDD');
@@ -62,6 +62,11 @@ $(document).ready(function () {
     }
 
     function fill_abd_examples() {
+    	if (!$('#naming_custom_abd').prop('checked')) {
+    		$('#naming_abd_pattern').qtip('hide');
+    		return;
+    	}
+    	
         var pattern = $('#naming_abd_pattern').val();
 
         $.get(sbRoot + '/config/postProcessing/testNaming', {pattern: pattern, abd: 'True'},
diff --git a/data/js/displayShow.js b/data/js/displayShow.js
index af26f4772e..11837b3576 100644
--- a/data/js/displayShow.js
+++ b/data/js/displayShow.js
@@ -12,12 +12,22 @@ $(document).ready(function(){
     });
 
     $("#prevShow").click(function(){
-        $('#pickShow option:selected').prev('option').attr('selected', 'selected');
+        var show = $('#pickShow option:selected');
+        if (show.prev('option').length < 1){
+            show.parent().children('option:last').attr('selected', 'selected');
+        } else{
+            show.prev('option').attr('selected', 'selected');
+        };
         $("#pickShow").change();
     });
 
     $("#nextShow").click(function(){
-        $('#pickShow option:selected').next('option').attr('selected', 'selected');
+        var show = $('#pickShow option:selected');
+        if (show.next('option').length < 1){
+            show.parent().children('option:first').attr('selected', 'selected');
+        } else{
+            show.next('option').attr('selected', 'selected');
+        };
         $("#pickShow").change();
     });
 
diff --git a/data/js/lib/formwizard.js b/data/js/lib/formwizard.js
index 5852492adb..195342900f 100644
--- a/data/js/lib/formwizard.js
+++ b/data/js/lib/formwizard.js
@@ -39,7 +39,7 @@ formtowizard.prototype={
 		}	
 		var i=(rawi=="prev")? this.currentsection-1 : (rawi=="next")? this.currentsection+1 : parseInt(rawi) //get index of next section to show
 		i=(i<0)? this.sections.count-1 : (i>this.sections.count-1)? 0 : i //make sure i doesn't exceed min/max limit
-		if (this.currentsection!=i && i<this.sections.count && doload){ //if next section to show isn't the same as the current section shown
+		if (i<this.sections.count && doload){ //if next section to show isn't the same as the current section shown
 			this.$thesteps.eq(this.currentsection).addClass('disabledstep').end().eq(i).removeClass('disabledstep') //dull current "step" text then highlight next "step" text
 			if (this.setting.revealfx[0]=="slide"){
 				this.sections.$sections.css("visibility", "visible")
@@ -69,6 +69,7 @@ formtowizard.prototype={
 			if (this.setting.persistsection) //enable persistence?
 				formtowizard.routines.setCookie(this.setting.formid+"_persist", i)
 			this.currentsection=i
+			if(i === 0) { setTimeout(function() { $('#nameToSearch').focus(); }, 250); }
 		}
 	},
 
diff --git a/data/js/newShow.js b/data/js/newShow.js
index 1f5dd8db9f..d8bf3f201c 100644
--- a/data/js/newShow.js
+++ b/data/js/newShow.js
@@ -1,68 +1,73 @@
-$(document).ready(function(){
+$(document).ready(function () {
 
     function populateSelect() {
-        if (!$('#nameToSearch').length)
-            return
+        if (!$('#nameToSearch').length) {
+            return;
+        }
 
         if ($('#tvdbLangSelect option').length <= 1) {
-            $.getJSON(sbRoot+'/home/addShows/getTVDBLanguages', {}, function(data){
-                var resultStr = '';
-        
-                if (data.results.length == 0) {
+            $.getJSON(sbRoot + '/home/addShows/getTVDBLanguages', {}, function (data) {
+                var selected, resultStr = '';
+
+                if (data.results.length === 0) {
                     resultStr = '<option value="en" selected="selected">en</option>';
                 } else {
-                    $.each(data.results, function(index, obj){
-                        if (resultStr == '')
-                                selected = ' selected="selected"';
-                        else
-                                selected = '';
-        
+                    $.each(data.results, function (index, obj) {
+                        if (resultStr == '') {
+                            selected = ' selected="selected"';
+                        } else {
+                            selected = '';
+                        }
+
                         resultStr += '<option value="' + obj + '"' + selected + '>' + obj + '</option>';
                     });
                 }
-        
+
                 $('#tvdbLangSelect').html(resultStr);
-        
-                $('#tvdbLangSelect').change(function() { searchTvdb() });
+                $('#tvdbLangSelect').change(function () { searchTvdb(); });
             });
         }
     }
 
-    function searchTvdb(){
-        if (!$('#nameToSearch').length)
-            return
+    function searchTvdb() {
+        if (!$('#nameToSearch').val().length) {
+            return;
+        }
 
-        $('#searchResults').html('<img id="searchingAnim" src="'+sbRoot+'/images/loading32.gif" height="32" width="32" /> searching...');
+        $('#searchResults').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32.gif" height="32" width="32" /> searching...');
 
-        $.getJSON(sbRoot+'/home/addShows/searchTVDBForShowName', {'name': $('#nameToSearch').val(), 'lang': $('#tvdbLangSelect').val()}, function(data){
+        $.getJSON(sbRoot + '/home/addShows/searchTVDBForShowName', {'name': $('#nameToSearch').val(), 'lang': $('#tvdbLangSelect').val()}, function (data) {
             var firstResult = true;
             var resultStr = '<fieldset>\n<legend>Search Results:</legend>\n';
-            
-            if (data.results.length == 0) {
+            var checked = '';
+
+            if (data.results.length === 0) {
                 resultStr += '<b>No results found, try a different search.</b>';
             } else {
-            
-                $.each(data.results, function(index, obj){
+                $.each(data.results, function (index, obj) {
                     if (firstResult) {
                         checked = ' checked';
                         firstResult = false;
-                    } else
+                    } else {
                         checked = '';
+                    }
                     resultStr += '<input type="radio" id="whichSeries" name="whichSeries" value="' + obj[0] + '|' + obj[1] + '"' + checked + ' /> ';
-                    if(data.langid && data.langid != "")
-                            resultStr += '<a href="http://thetvdb.com/?tab=series&id=' + obj[0] + '&lid=' + data.langid + '" onclick=\"window.open(this.href, \'_blank\'); return false;\" ><b>' + obj[1] + '</b></a>';
-                    else
+                    if (data.langid && data.langid != "") {
+                        resultStr += '<a href="http://thetvdb.com/?tab=series&id=' + obj[0] + '&lid=' + data.langid + '" onclick=\"window.open(this.href, \'_blank\'); return false;\" ><b>' + obj[1] + '</b></a>';
+                    } else {
                         resultStr += '<a href="http://thetvdb.com/?tab=series&id=' + obj[0] + '" onclick=\"window.open(this.href, \'_blank\'); return false;\" ><b>' + obj[1] + '</b></a>';
+                    }
 
-                    if (obj[2] != null) {
+                    if (obj[2] !== null) {
                         var startDate = new Date(obj[2]);
                         var today = new Date();
-                        if (startDate>today)
-                                resultStr += ' (will debut on ' + obj[2] + ')';
-                        else
-                                resultStr += ' (started on ' + obj[2] + ')';
+                        if (startDate > today) {
+                            resultStr += ' (will debut on ' + obj[2] + ')';
+                        } else {
+                            resultStr += ' (started on ' + obj[2] + ')';
+                        }
                     }
-                    
+
                     resultStr += '<br />';
                 });
                 resultStr += '</ul>';
@@ -70,54 +75,58 @@ $(document).ready(function(){
             resultStr += '</fieldset>';
             $('#searchResults').html(resultStr);
             updateSampleText();
+            myform.loadsection(0);
         });
-    };
+    }
 
-    $('#searchName').click(function() {searchTvdb()});
+    $('#searchName').click(function () { searchTvdb(); });
 
-    if ($('#nameToSearch').length && $('#nameToSearch').val().length)
-        $('#searchName').click()
+    if ($('#nameToSearch').length && $('#nameToSearch').val().length) {
+        $('#searchName').click();
+    }
 
-    $('#addShowButton').click(function(){
-        
+    $('#addShowButton').click(function () {
         // if they haven't picked a show don't let them submit
         if (!$("input:radio[name='whichSeries']:checked").val() && !$("input:hidden[name='whichSeries']").val().length) {
             alert('You must choose a show to continue');
             return false;
         }
 
-        $('#addShowForm').submit()
-
+        $('#addShowForm').submit();
     });
-    
-    $('#skipShowButton').click(function(){
+
+    $('#skipShowButton').click(function () {
         $('#skipShow').val('1');
         $('#addShowForm').submit();
     });
-    
+
+    $('#qualityPreset').change(function () {
+        myform.loadsection(2);
+    });
+
     /***********************************************
     * jQuery Form to Form Wizard- (c) Dynamic Drive (www.dynamicdrive.com)
     * This notice MUST stay intact for legal use
     * Visit http://www.dynamicdrive.com/ for this script and 100s more.
     ***********************************************/
 
-    var myform=new formtowizard({
+    var myform = new formtowizard({
         formid: 'addShowForm',
         revealfx: ['slide', 500],
         oninit: function () {
             populateSelect();
             updateSampleText();
-            if ($('input:hidden[name=whichSeries]').length && $('#fullShowPath').length)
+            if ($('input:hidden[name=whichSeries]').length && $('#fullShowPath').length) {
                 goToStep(3);
-            if ($('#nameToSearch').length)
-                $('#nameToSearch').focus();
+            }
         }
     });
 
-    function goToStep(num){
-        $('.step').each(function(){
-            if ($.data(this, 'section')+1 == num)
+    function goToStep(num) {
+        $('.step').each(function () {
+            if ($.data(this, 'section') + 1 == num) {
                 $(this).click();
+            }
         });
     }
 
@@ -125,33 +134,35 @@ $(document).ready(function(){
 
     function updateSampleText() {
         // if something's selected then we have some behavior to figure out
-        
-        var show_name;
+
+        var show_name, sep_char;
         // if they've picked a radio button then use that
-        if ($('input:radio[name=whichSeries]:checked').length)
+        if ($('input:radio[name=whichSeries]:checked').length) {
             show_name = $('input:radio[name=whichSeries]:checked').val().split('|')[1];
-
-        // if we provided a show in the hidden field, use that 
-        else if ($('input:hidden[name=whichSeries]').length && $('input:hidden[name=whichSeries]').val().length)
+        }
+        // if we provided a show in the hidden field, use that
+        else if ($('input:hidden[name=whichSeries]').length && $('input:hidden[name=whichSeries]').val().length) {
             show_name = $('#providedName').val();
-
-        else
+        } else {
             show_name = '';
-        
-        var sample_text = 'Adding show <b>'+show_name+'</b> into <b>';
+        }
+
+        var sample_text = 'Adding show <b>' + show_name + '</b> into <b>';
 
         // if we have a root dir selected, figure out the path
         if ($("#rootDirs option:selected").length) {
             var root_dir_text = $('#rootDirs option:selected').val();
-            if (root_dir_text.indexOf('/') >= 0)
+            if (root_dir_text.indexOf('/') >= 0) {
                 sep_char = '/';
-            else if (root_dir_text.indexOf('\\') >= 0)
+            } else if (root_dir_text.indexOf('\\') >= 0) {
                 sep_char = '\\';
-            else
+            } else {
                 sep_char = '';
+            }
 
-            if (root_dir_text.substr(sample_text.length-1) != sep_char)
+            if (root_dir_text.substr(sample_text.length - 1) != sep_char) {
                 root_dir_text += sep_char;
+            }
             root_dir_text += '<i>||</i>' + sep_char;
 
             sample_text += root_dir_text;
@@ -160,33 +171,35 @@ $(document).ready(function(){
         } else {
             sample_text += 'unknown dir.';
         }
-        
+
         sample_text += '</b>';
 
         // if we have a show name then sanitize and use it for the dir name
         if (show_name.length) {
-            $.get(sbRoot+'/home/addShows/sanitizeFileName', {name: show_name}, function(data){
-                 $('#displayText').html(sample_text.replace('||', data));
+            $.get(sbRoot + '/home/addShows/sanitizeFileName', {name: show_name}, function (data) {
+                $('#displayText').html(sample_text.replace('||', data));
             });
-
         // if not then it's unknown
-        } else
+        } else {
             $('#displayText').html(sample_text.replace('||', '??'));
-        
+        }
+
         // also toggle the add show button
-        if (($("#rootDirs option:selected").length || ($('#fullShowPath').length && $('#fullShowPath').val().length)) && 
-            ($('input:radio[name=whichSeries]:checked').length) || ($('input:hidden[name=whichSeries]').length && $('input:hidden[name=whichSeries]').val().length))
+        if (($("#rootDirs option:selected").length || ($('#fullShowPath').length && $('#fullShowPath').val().length)) &&
+            ($('input:radio[name=whichSeries]:checked').length) || ($('input:hidden[name=whichSeries]').length && $('input:hidden[name=whichSeries]').val().length)) {
             $('#addShowButton').attr('disabled', false);
-        else
+        } else {
             $('#addShowButton').attr('disabled', true);
+        }
     }
-    
+
     $('#rootDirText').change(updateSampleText);
     $('#whichSeries').live('change', updateSampleText);
 
-    $('#nameToSearch').keyup(function(event){
-        if(event.keyCode == 13)
+    $('#nameToSearch').keyup(function (event) {
+        if (event.keyCode == 13) {
             $('#searchName').click();
+        }
     });
 
-});
\ No newline at end of file
+});
diff --git a/data/js/qualityChooser.js b/data/js/qualityChooser.js
index 6d9956cfe6..66b582e1b6 100644
--- a/data/js/qualityChooser.js
+++ b/data/js/qualityChooser.js
@@ -1,29 +1,36 @@
-$(document).ready(function(){
+$(document).ready(function() {
     function setFromPresets (preset) {
         if (preset == 0) {
-          $('#customQuality').show();
-          return
-        } else
-          $('#customQuality').hide();
-    
+            $('#customQuality').show();
+            return;
+        } else {
+            $('#customQuality').hide();
+        }
+
         $('#anyQualities option').each(function(i) {
-            var result = preset & $(this).val()
-            if (result > 0) $(this).attr('selected', 'selected');
-            else $(this).attr('selected', false);
+            var result = preset & $(this).val();
+            if (result > 0) {
+                $(this).attr('selected', 'selected');
+            } else {
+                $(this).attr('selected', false);
+            }
         });
-    
+
         $('#bestQualities option').each(function(i) {
-            var result = preset & ($(this).val() << 16)
-            if (result > 0) $(this).attr('selected', 'selected');
-            else $(this).attr('selected', false);
+            var result = preset & ($(this).val() << 16);
+            if (result > 0) {
+                $(this).attr('selected', 'selected');
+            } else {
+                $(this).attr('selected', false);
+            }
         });
-    
-        return
+
+        return;
     }
-    
-    $('#qualityPreset').change(function(){
-          setFromPresets($('#qualityPreset :selected').val());
+
+    $('#qualityPreset').change(function() {
+        setFromPresets($('#qualityPreset :selected').val());
     });
-    
-    setFromPresets($('#qualityPreset :selected').val())
-});
\ No newline at end of file
+
+    setFromPresets($('#qualityPreset :selected').val());
+});
diff --git a/lib/tvdb_api/setup.py b/lib/tvdb_api/setup.py
index 221d769380..18eb7d1abd 100644
--- a/lib/tvdb_api/setup.py
+++ b/lib/tvdb_api/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 setup(
 name = 'tvdb_api',
-version='1.7.2',
+version='1.8.2',
 
 author='dbr/Ben',
 description='Interface to thetvdb.com',
diff --git a/lib/tvdb_api/tvdb_api.py b/lib/tvdb_api/tvdb_api.py
index 3b3b5a61c8..ba71b15fb3 100755
--- a/lib/tvdb_api/tvdb_api.py
+++ b/lib/tvdb_api/tvdb_api.py
@@ -15,11 +15,13 @@
 u'Cabin Fever'
 """
 __author__ = "dbr/Ben"
-__version__ = "1.7.2"
+__version__ = "1.8.2"
 
-import os, time
+import os
+import time
 import urllib
 import urllib2
+import getpass
 import StringIO
 import tempfile
 import warnings
@@ -494,9 +496,19 @@ def __init__(self,
     #end __init__
 
     def _getTempDir(self):
-        """Returns the [system temp dir]/tvdb_api
+        """Returns the [system temp dir]/tvdb_api-u501 (or
+        tvdb_api-myuser)
         """
-        return os.path.join(tempfile.gettempdir(), "tvdb_api")
+        if hasattr(os, 'getuid'):
+            uid = "u%d" % (os.getuid())
+        else:
+            # For Windows
+            try:
+                uid = getpass.getuser()
+            except ImportError:
+                return os.path.join(tempfile.gettempdir(), "tvdb_api")
+
+        return os.path.join(tempfile.gettempdir(), "tvdb_api-%s" % (uid))
 
     def _loadUrl(self, url, recache = False, language=None):
         global lastTimeout
diff --git a/lib/tvdb_api/tvdb_cache.py b/lib/tvdb_api/tvdb_cache.py
index f65db615cd..16d79a22bb 100755
--- a/lib/tvdb_api/tvdb_cache.py
+++ b/lib/tvdb_api/tvdb_cache.py
@@ -12,7 +12,7 @@
 from __future__ import with_statement
 
 __author__ = "dbr/Ben"
-__version__ = "1.7.2"
+__version__ = "1.8.2"
 
 import os
 import time
diff --git a/lib/tvdb_api/tvdb_exceptions.py b/lib/tvdb_api/tvdb_exceptions.py
index 6a4e59c9ac..c3fe5c7474 100755
--- a/lib/tvdb_api/tvdb_exceptions.py
+++ b/lib/tvdb_api/tvdb_exceptions.py
@@ -9,7 +9,7 @@
 """
 
 __author__ = "dbr/Ben"
-__version__ = "1.7.2"
+__version__ = "1.8.2"
 
 __all__ = ["tvdb_error", "tvdb_userabort", "tvdb_shownotfound",
 "tvdb_seasonnotfound", "tvdb_episodenotfound", "tvdb_attributenotfound"]
diff --git a/lib/tvdb_api/tvdb_ui.py b/lib/tvdb_api/tvdb_ui.py
index 7050bf5197..b3296a9d04 100755
--- a/lib/tvdb_api/tvdb_ui.py
+++ b/lib/tvdb_api/tvdb_ui.py
@@ -43,7 +43,7 @@
 """
 
 __author__ = "dbr/Ben"
-__version__ = "1.7.2"
+__version__ = "1.8.2"
 
 import logging
 import warnings
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 39f43c65b3..e9b4eb4245 100755
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -30,7 +30,7 @@
 
 # apparently py2exe won't build these unless they're imported somewhere
 from sickbeard import providers, metadata
-from providers import ezrss, tvtorrents, btn, nzbmatrix, nzbsrus, newznab, womble, newzbin, nzbs_org_old
+from providers import ezrss, tvtorrents, btn, nzbsrus, newznab, womble
 from sickbeard.config import CheckSection, check_setting_int, check_setting_str, ConfigMigrator
 
 from sickbeard import searchCurrent, searchBacklog, showUpdater, versionChecker, properFinder, autoPostProcesser
@@ -296,10 +296,12 @@
 
 __INITIALIZED__ = False
 
+
 def get_backlog_cycle_time():
-    cycletime = SEARCH_FREQUENCY*2+7
+    cycletime = SEARCH_FREQUENCY * 2 + 7
     return max([cycletime, 720])
 
+
 def initialize(consoleLogging=True):
 
     with INIT_LOCK:
@@ -343,20 +345,6 @@ def initialize(consoleLogging=True):
         socket.setdefaulttimeout(SOCKET_TIMEOUT)
 
         CheckSection(CFG, 'General')
-        CheckSection(CFG, 'Blackhole')
-        CheckSection(CFG, 'Newzbin')
-        CheckSection(CFG, 'SABnzbd')
-        CheckSection(CFG, 'NZBget')
-        CheckSection(CFG, 'XBMC')
-        CheckSection(CFG, 'PLEX')
-        CheckSection(CFG, 'Growl')
-        CheckSection(CFG, 'Prowl')
-        CheckSection(CFG, 'Twitter')
-        CheckSection(CFG, 'NMJ')
-        CheckSection(CFG, 'Synology')
-        CheckSection(CFG, 'pyTivo')
-        CheckSection(CFG, 'NMA')
-
         LOG_DIR = check_setting_str(CFG, 'General', 'log_dir', 'Logs')
         if not helpers.makeDir(LOG_DIR):
             logger.log(u"!!! No log folder, logging to screen only!", logger.ERROR)
@@ -377,11 +365,10 @@ def initialize(consoleLogging=True):
         WEB_PASSWORD = check_setting_str(CFG, 'General', 'web_password', '')
         LAUNCH_BROWSER = bool(check_setting_int(CFG, 'General', 'launch_browser', 1))
 
-        USE_API = bool(check_setting_int(CFG, 'General', 'use_api', 0)) 
+        USE_API = bool(check_setting_int(CFG, 'General', 'use_api', 0))
         API_KEY = check_setting_str(CFG, 'General', 'api_key', '')
-        
+
         ENABLE_HTTPS = bool(check_setting_int(CFG, 'General', 'enable_https', 0))
-        
         HTTPS_CERT = check_setting_str(CFG, 'General', 'https_cert', 'server.crt')
         HTTPS_KEY = check_setting_str(CFG, 'General', 'https_key', 'server.key')
 
@@ -389,27 +376,27 @@ def initialize(consoleLogging=True):
         # fix bad configs due to buggy code
         if ACTUAL_CACHE_DIR == 'None':
             ACTUAL_CACHE_DIR = 'cache'
-        
+
         # unless they specify, put the cache dir inside the data dir
         if not os.path.isabs(ACTUAL_CACHE_DIR):
             CACHE_DIR = os.path.join(DATA_DIR, ACTUAL_CACHE_DIR)
         else:
             CACHE_DIR = ACTUAL_CACHE_DIR
-        
+
         if not helpers.makeDir(CACHE_DIR):
             logger.log(u"!!! Creating local cache dir failed, using system default", logger.ERROR)
             CACHE_DIR = None
-        
+
         ROOT_DIRS = check_setting_str(CFG, 'General', 'root_dirs', '')
         if not re.match(r'\d+\|[^|]+(?:\|[^|]+)*', ROOT_DIRS):
             ROOT_DIRS = ''
-        
+
         proxies = urllib.getproxies()
-        proxy_url = None
+        proxy_url = None # @UnusedVariable
         if 'http' in proxies:
-            proxy_url = proxies['http']
+            proxy_url = proxies['http'] # @UnusedVariable
         elif 'ftp' in proxies:
-            proxy_url = proxies['ftp']
+            proxy_url = proxies['ftp'] # @UnusedVariable
 
         # Set our common tvdb_api options here
         TVDB_API_PARMS = {'apikey': TVDB_API_KEY,
@@ -419,6 +406,8 @@ def initialize(consoleLogging=True):
         if CACHE_DIR:
             TVDB_API_PARMS['cache'] = os.path.join(CACHE_DIR, 'tvdb')
 
+        TVDB_BASE_URL = 'http://www.thetvdb.com/api/' + TVDB_API_KEY
+
         QUALITY_DEFAULT = check_setting_int(CFG, 'General', 'quality_default', SD)
         STATUS_DEFAULT = check_setting_int(CFG, 'General', 'status_default', SKIPPED)
         VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 1)
@@ -432,8 +421,6 @@ def initialize(consoleLogging=True):
         NAMING_MULTI_EP = check_setting_int(CFG, 'General', 'naming_multi_ep', 1)
         NAMING_FORCE_FOLDERS = naming.check_force_season_folders()
 
-        TVDB_BASE_URL = 'http://www.thetvdb.com/api/' + TVDB_API_KEY
-
         USE_NZBS = bool(check_setting_int(CFG, 'General', 'use_nzbs', 1))
         USE_TORRENTS = bool(check_setting_int(CFG, 'General', 'use_torrents', 0))
 
@@ -442,16 +429,11 @@ def initialize(consoleLogging=True):
             NZB_METHOD = 'blackhole'
 
         DOWNLOAD_PROPERS = bool(check_setting_int(CFG, 'General', 'download_propers', 1))
-
         USENET_RETENTION = check_setting_int(CFG, 'General', 'usenet_retention', 500)
-
         SEARCH_FREQUENCY = check_setting_int(CFG, 'General', 'search_frequency', DEFAULT_SEARCH_FREQUENCY)
         if SEARCH_FREQUENCY < MIN_SEARCH_FREQUENCY:
             SEARCH_FREQUENCY = MIN_SEARCH_FREQUENCY
 
-        NZB_DIR = check_setting_str(CFG, 'Blackhole', 'nzb_dir', '')
-        TORRENT_DIR = check_setting_str(CFG, 'Blackhole', 'torrent_dir', '')
-
         TV_DOWNLOAD_DIR = check_setting_str(CFG, 'General', 'tv_download_dir', '')
         PROCESS_AUTOMATICALLY = check_setting_int(CFG, 'General', 'process_automatically', 0)
         RENAME_EPISODES = check_setting_int(CFG, 'General', 'rename_episodes', 1)
@@ -459,47 +441,135 @@ def initialize(consoleLogging=True):
         MOVE_ASSOCIATED_FILES = check_setting_int(CFG, 'General', 'move_associated_files', 0)
         CREATE_MISSING_SHOW_DIRS = check_setting_int(CFG, 'General', 'create_missing_show_dirs', 0)
         ADD_SHOWS_WO_DIR = check_setting_int(CFG, 'General', 'add_shows_wo_dir', 0)
-        
+
         EZRSS = bool(check_setting_int(CFG, 'General', 'use_torrent', 0))
         if not EZRSS:
+            CheckSection(CFG, 'EZRSS')
             EZRSS = bool(check_setting_int(CFG, 'EZRSS', 'ezrss', 0))
-            
-        TVTORRENTS = bool(check_setting_int(CFG, 'TVTORRENTS', 'tvtorrents', 0))    
+
+        GIT_PATH = check_setting_str(CFG, 'General', 'git_path', '')
+        IGNORE_WORDS = check_setting_str(CFG, 'General', 'ignore_words', IGNORE_WORDS)
+        EXTRA_SCRIPTS = [x for x in check_setting_str(CFG, 'General', 'extra_scripts', '').split('|') if x]
+
+        USE_BANNER = bool(check_setting_int(CFG, 'General', 'use_banner', 0))
+        USE_LISTVIEW = bool(check_setting_int(CFG, 'General', 'use_listview', 0))
+        METADATA_TYPE = check_setting_str(CFG, 'General', 'metadata_type', '')
+
+        metadata_provider_dict = metadata.get_metadata_generator_dict()
+
+        # if this exists it's legacy, use the info to upgrade metadata to the new settings
+        if METADATA_TYPE:
+
+            old_metadata_class = None
+
+            if METADATA_TYPE == 'xbmc':
+                old_metadata_class = metadata.xbmc.metadata_class
+            elif METADATA_TYPE == 'mediabrowser':
+                old_metadata_class = metadata.mediabrowser.metadata_class
+            elif METADATA_TYPE == 'ps3':
+                old_metadata_class = metadata.ps3.metadata_class
+
+            if old_metadata_class:
+
+                METADATA_SHOW = bool(check_setting_int(CFG, 'General', 'metadata_show', 1))
+                METADATA_EPISODE = bool(check_setting_int(CFG, 'General', 'metadata_episode', 1))
+
+                ART_POSTER = bool(check_setting_int(CFG, 'General', 'art_poster', 1))
+                ART_FANART = bool(check_setting_int(CFG, 'General', 'art_fanart', 1))
+                ART_THUMBNAILS = bool(check_setting_int(CFG, 'General', 'art_thumbnails', 1))
+                ART_SEASON_THUMBNAILS = bool(check_setting_int(CFG, 'General', 'art_season_thumbnails', 1))
+
+                new_metadata_class = old_metadata_class(METADATA_SHOW,
+                                                        METADATA_EPISODE,
+                                                        ART_POSTER,
+                                                        ART_FANART,
+                                                        ART_THUMBNAILS,
+                                                        ART_SEASON_THUMBNAILS)
+
+                metadata_provider_dict[new_metadata_class.name] = new_metadata_class
+
+        # this is the normal codepath for metadata config
+        else:
+            METADATA_XBMC = check_setting_str(CFG, 'General', 'metadata_xbmc', '0|0|0|0|0|0')
+            METADATA_MEDIABROWSER = check_setting_str(CFG, 'General', 'metadata_mediabrowser', '0|0|0|0|0|0')
+            METADATA_PS3 = check_setting_str(CFG, 'General', 'metadata_ps3', '0|0|0|0|0|0')
+            METADATA_WDTV = check_setting_str(CFG, 'General', 'metadata_wdtv', '0|0|0|0|0|0')
+            METADATA_TIVO = check_setting_str(CFG, 'General', 'metadata_tivo', '0|0|0|0|0|0')
+            METADATA_SYNOLOGY = check_setting_str(CFG, 'General', 'metadata_synology', '0|0|0|0|0|0')
+
+            for cur_metadata_tuple in [(METADATA_XBMC, metadata.xbmc),
+                                       (METADATA_MEDIABROWSER, metadata.mediabrowser),
+                                       (METADATA_PS3, metadata.ps3),
+                                       (METADATA_WDTV, metadata.wdtv),
+                                       (METADATA_TIVO, metadata.tivo),
+                                       (METADATA_SYNOLOGY, metadata.synology),
+                                       ]:
+
+                (cur_metadata_config, cur_metadata_class) = cur_metadata_tuple
+                tmp_provider = cur_metadata_class.metadata_class()
+                tmp_provider.set_config(cur_metadata_config)
+                metadata_provider_dict[tmp_provider.name] = tmp_provider
+
+        CheckSection(CFG, 'GUI')
+        COMING_EPS_LAYOUT = check_setting_str(CFG, 'GUI', 'coming_eps_layout', 'banner')
+        COMING_EPS_DISPLAY_PAUSED = bool(check_setting_int(CFG, 'GUI', 'coming_eps_display_paused', 0))
+        COMING_EPS_SORT = check_setting_str(CFG, 'GUI', 'coming_eps_sort', 'date')
+
+        CheckSection(CFG, 'Newznab')
+        newznabData = check_setting_str(CFG, 'Newznab', 'newznab_data', '')
+        newznabProviderList = providers.getNewznabProviderList(newznabData)
+        providerList = providers.makeProviderList()
+
+        CheckSection(CFG, 'Blackhole')
+        NZB_DIR = check_setting_str(CFG, 'Blackhole', 'nzb_dir', '')
+        TORRENT_DIR = check_setting_str(CFG, 'Blackhole', 'torrent_dir', '')
+
+        CheckSection(CFG, 'TVTORRENTS')
+        TVTORRENTS = bool(check_setting_int(CFG, 'TVTORRENTS', 'tvtorrents', 0))
         TVTORRENTS_DIGEST = check_setting_str(CFG, 'TVTORRENTS', 'tvtorrents_digest', '')
         TVTORRENTS_HASH = check_setting_str(CFG, 'TVTORRENTS', 'tvtorrents_hash', '')
 
-        BTN = bool(check_setting_int(CFG, 'BTN', 'btn', 0))    
+        CheckSection(CFG, 'BTN')
+        BTN = bool(check_setting_int(CFG, 'BTN', 'btn', 0))
         BTN_API_KEY = check_setting_str(CFG, 'BTN', 'btn_api_key', '')
 
+        CheckSection(CFG, 'NZBs')
         NZBS = bool(check_setting_int(CFG, 'NZBs', 'nzbs', 0))
         NZBS_UID = check_setting_str(CFG, 'NZBs', 'nzbs_uid', '')
         NZBS_HASH = check_setting_str(CFG, 'NZBs', 'nzbs_hash', '')
-        
+
+        CheckSection(CFG, 'NZBsRUS')
         NZBSRUS = bool(check_setting_int(CFG, 'NZBsRUS', 'nzbsrus', 0))
         NZBSRUS_UID = check_setting_str(CFG, 'NZBsRUS', 'nzbsrus_uid', '')
         NZBSRUS_HASH = check_setting_str(CFG, 'NZBsRUS', 'nzbsrus_hash', '')
 
+        CheckSection(CFG, 'NZBMatrix')
         NZBMATRIX = bool(check_setting_int(CFG, 'NZBMatrix', 'nzbmatrix', 0))
         NZBMATRIX_USERNAME = check_setting_str(CFG, 'NZBMatrix', 'nzbmatrix_username', '')
         NZBMATRIX_APIKEY = check_setting_str(CFG, 'NZBMatrix', 'nzbmatrix_apikey', '')
 
+        CheckSection(CFG, 'Newzbin')
         NEWZBIN = bool(check_setting_int(CFG, 'Newzbin', 'newzbin', 0))
         NEWZBIN_USERNAME = check_setting_str(CFG, 'Newzbin', 'newzbin_username', '')
         NEWZBIN_PASSWORD = check_setting_str(CFG, 'Newzbin', 'newzbin_password', '')
 
+        CheckSection(CFG, 'Womble')
         WOMBLE = bool(check_setting_int(CFG, 'Womble', 'womble', 1))
 
+        CheckSection(CFG, 'SABnzbd')
         SAB_USERNAME = check_setting_str(CFG, 'SABnzbd', 'sab_username', '')
         SAB_PASSWORD = check_setting_str(CFG, 'SABnzbd', 'sab_password', '')
         SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '')
         SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', 'tv')
         SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '')
 
+        CheckSection(CFG, 'NZBget')
         NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', 'tegbzn6789')
         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv')
         NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '')
 
-        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0)) 
+        CheckSection(CFG, 'XBMC')
+        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0))
         XBMC_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_onsnatch', 0))
         XBMC_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_ondownload', 0))
         XBMC_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_library', 0))
@@ -508,6 +578,7 @@ def initialize(consoleLogging=True):
         XBMC_USERNAME = check_setting_str(CFG, 'XBMC', 'xbmc_username', '')
         XBMC_PASSWORD = check_setting_str(CFG, 'XBMC', 'xbmc_password', '')
 
+        CheckSection(CFG, 'Plex')
         USE_PLEX = bool(check_setting_int(CFG, 'Plex', 'use_plex', 0))
         PLEX_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Plex', 'plex_notify_onsnatch', 0))
         PLEX_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Plex', 'plex_notify_ondownload', 0))
@@ -517,57 +588,68 @@ def initialize(consoleLogging=True):
         PLEX_USERNAME = check_setting_str(CFG, 'Plex', 'plex_username', '')
         PLEX_PASSWORD = check_setting_str(CFG, 'Plex', 'plex_password', '')
 
+        CheckSection(CFG, 'Growl')
         USE_GROWL = bool(check_setting_int(CFG, 'Growl', 'use_growl', 0))
         GROWL_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Growl', 'growl_notify_onsnatch', 0))
         GROWL_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Growl', 'growl_notify_ondownload', 0))
         GROWL_HOST = check_setting_str(CFG, 'Growl', 'growl_host', '')
         GROWL_PASSWORD = check_setting_str(CFG, 'Growl', 'growl_password', '')
 
+        CheckSection(CFG, 'Prowl')
         USE_PROWL = bool(check_setting_int(CFG, 'Prowl', 'use_prowl', 0))
         PROWL_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Prowl', 'prowl_notify_onsnatch', 0))
         PROWL_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Prowl', 'prowl_notify_ondownload', 0))
         PROWL_API = check_setting_str(CFG, 'Prowl', 'prowl_api', '')
         PROWL_PRIORITY = check_setting_str(CFG, 'Prowl', 'prowl_priority', "0")
 
+        CheckSection(CFG, 'Twitter')
         USE_TWITTER = bool(check_setting_int(CFG, 'Twitter', 'use_twitter', 0))
         TWITTER_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Twitter', 'twitter_notify_onsnatch', 0))
-        TWITTER_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Twitter', 'twitter_notify_ondownload', 0))        
+        TWITTER_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Twitter', 'twitter_notify_ondownload', 0))
         TWITTER_USERNAME = check_setting_str(CFG, 'Twitter', 'twitter_username', '')
         TWITTER_PASSWORD = check_setting_str(CFG, 'Twitter', 'twitter_password', '')
         TWITTER_PREFIX = check_setting_str(CFG, 'Twitter', 'twitter_prefix', 'Sick Beard')
 
+        CheckSection(CFG, 'Notifo')
         USE_NOTIFO = bool(check_setting_int(CFG, 'Notifo', 'use_notifo', 0))
         NOTIFO_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Notifo', 'notifo_notify_onsnatch', 0))
         NOTIFO_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Notifo', 'notifo_notify_ondownload', 0))
         NOTIFO_USERNAME = check_setting_str(CFG, 'Notifo', 'notifo_username', '')
         NOTIFO_APISECRET = check_setting_str(CFG, 'Notifo', 'notifo_apisecret', '')
 
+        CheckSection(CFG, 'Boxcar')
         USE_BOXCAR = bool(check_setting_int(CFG, 'Boxcar', 'use_boxcar', 0))
         BOXCAR_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Boxcar', 'boxcar_notify_onsnatch', 0))
         BOXCAR_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Boxcar', 'boxcar_notify_ondownload', 0))
         BOXCAR_USERNAME = check_setting_str(CFG, 'Boxcar', 'boxcar_username', '')
 
+        CheckSection(CFG, 'Pushover')
         USE_PUSHOVER = bool(check_setting_int(CFG, 'Pushover', 'use_pushover', 0))
         PUSHOVER_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Pushover', 'pushover_notify_onsnatch', 0))
         PUSHOVER_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Pushover', 'pushover_notify_ondownload', 0))
         PUSHOVER_USERKEY = check_setting_str(CFG, 'Pushover', 'pushover_userkey', '')
 
+        CheckSection(CFG, 'Libnotify')
         USE_LIBNOTIFY = bool(check_setting_int(CFG, 'Libnotify', 'use_libnotify', 0))
         LIBNOTIFY_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Libnotify', 'libnotify_notify_onsnatch', 0))
         LIBNOTIFY_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Libnotify', 'libnotify_notify_ondownload', 0))
 
+        CheckSection(CFG, 'NMJ')
         USE_NMJ = bool(check_setting_int(CFG, 'NMJ', 'use_nmj', 0))
         NMJ_HOST = check_setting_str(CFG, 'NMJ', 'nmj_host', '')
         NMJ_DATABASE = check_setting_str(CFG, 'NMJ', 'nmj_database', '')
         NMJ_MOUNT = check_setting_str(CFG, 'NMJ', 'nmj_mount', '')
 
+        CheckSection(CFG, 'Synology')
         USE_SYNOINDEX = bool(check_setting_int(CFG, 'Synology', 'use_synoindex', 0))
 
+        CheckSection(CFG, 'Trakt')
         USE_TRAKT = bool(check_setting_int(CFG, 'Trakt', 'use_trakt', 0))
         TRAKT_USERNAME = check_setting_str(CFG, 'Trakt', 'trakt_username', '')
         TRAKT_PASSWORD = check_setting_str(CFG, 'Trakt', 'trakt_password', '')
         TRAKT_API = check_setting_str(CFG, 'Trakt', 'trakt_api', '')
-        
+
+        CheckSection(CFG, 'pyTivo')
         USE_PYTIVO = bool(check_setting_int(CFG, 'pyTivo', 'use_pytivo', 0))
         PYTIVO_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'pyTivo', 'pytivo_notify_onsnatch', 0))
         PYTIVO_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'pyTivo', 'pytivo_notify_ondownload', 0))
@@ -576,94 +658,22 @@ def initialize(consoleLogging=True):
         PYTIVO_SHARE_NAME = check_setting_str(CFG, 'pyTivo', 'pytivo_share_name', '')
         PYTIVO_TIVO_NAME = check_setting_str(CFG, 'pyTivo', 'pytivo_tivo_name', '')
 
+        CheckSection(CFG, 'NMA')
         USE_NMA = bool(check_setting_int(CFG, 'NMA', 'use_nma', 0))
         NMA_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'NMA', 'nma_notify_onsnatch', 0))
         NMA_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'NMA', 'nma_notify_ondownload', 0))
         NMA_API = check_setting_str(CFG, 'NMA', 'nma_api', '')
         NMA_PRIORITY = check_setting_str(CFG, 'NMA', 'nma_priority', "0")
 
-        GIT_PATH = check_setting_str(CFG, 'General', 'git_path', '')
-
-        IGNORE_WORDS = check_setting_str(CFG, 'General', 'ignore_words', IGNORE_WORDS)
-
-        EXTRA_SCRIPTS = [x for x in check_setting_str(CFG, 'General', 'extra_scripts', '').split('|') if x]
-
-        USE_BANNER = bool(check_setting_int(CFG, 'General', 'use_banner', 0))
-        USE_LISTVIEW = bool(check_setting_int(CFG, 'General', 'use_listview', 0))
-        METADATA_TYPE = check_setting_str(CFG, 'General', 'metadata_type', '')
-
-        metadata_provider_dict = metadata.get_metadata_generator_dict()
-        
-        # if this exists it's legacy, use the info to upgrade metadata to the new settings
-        if METADATA_TYPE:
-
-            old_metadata_class = None
-
-            if METADATA_TYPE == 'xbmc':
-                old_metadata_class = metadata.xbmc.metadata_class
-            elif METADATA_TYPE == 'mediabrowser':
-                old_metadata_class = metadata.mediabrowser.metadata_class
-            elif METADATA_TYPE == 'ps3':
-                old_metadata_class = metadata.ps3.metadata_class
-        
-            if old_metadata_class:
-                
-                METADATA_SHOW = bool(check_setting_int(CFG, 'General', 'metadata_show', 1))
-                METADATA_EPISODE = bool(check_setting_int(CFG, 'General', 'metadata_episode', 1))
-            
-                ART_POSTER = bool(check_setting_int(CFG, 'General', 'art_poster', 1))
-                ART_FANART = bool(check_setting_int(CFG, 'General', 'art_fanart', 1))
-                ART_THUMBNAILS = bool(check_setting_int(CFG, 'General', 'art_thumbnails', 1))
-                ART_SEASON_THUMBNAILS = bool(check_setting_int(CFG, 'General', 'art_season_thumbnails', 1))
-
-                new_metadata_class = old_metadata_class(METADATA_SHOW,
-                                                        METADATA_EPISODE,
-                                                        ART_POSTER,
-                                                        ART_FANART,
-                                                        ART_THUMBNAILS,
-                                                        ART_SEASON_THUMBNAILS)
-                
-                metadata_provider_dict[new_metadata_class.name] = new_metadata_class
-
-        # this is the normal codepath for metadata config
-        else:
-            METADATA_XBMC = check_setting_str(CFG, 'General', 'metadata_xbmc', '0|0|0|0|0|0')
-            METADATA_MEDIABROWSER = check_setting_str(CFG, 'General', 'metadata_mediabrowser', '0|0|0|0|0|0')
-            METADATA_PS3 = check_setting_str(CFG, 'General', 'metadata_ps3', '0|0|0|0|0|0')
-            METADATA_WDTV = check_setting_str(CFG, 'General', 'metadata_wdtv', '0|0|0|0|0|0')
-            METADATA_TIVO = check_setting_str(CFG, 'General', 'metadata_tivo', '0|0|0|0|0|0')
-            METADATA_SYNOLOGY = check_setting_str(CFG, 'General', 'metadata_synology', '0|0|0|0|0|0')
-
-            for cur_metadata_tuple in [(METADATA_XBMC, metadata.xbmc),
-                                       (METADATA_MEDIABROWSER, metadata.mediabrowser),
-                                       (METADATA_PS3, metadata.ps3),
-                                       (METADATA_WDTV, metadata.wdtv),
-                                       (METADATA_TIVO, metadata.tivo),
-                                       (METADATA_SYNOLOGY, metadata.synology),
-                                       ]:
-
-                (cur_metadata_config, cur_metadata_class) = cur_metadata_tuple
-                tmp_provider = cur_metadata_class.metadata_class()
-                tmp_provider.set_config(cur_metadata_config)
-                metadata_provider_dict[tmp_provider.name] = tmp_provider
-
-        COMING_EPS_LAYOUT = check_setting_str(CFG, 'GUI', 'coming_eps_layout', 'banner')
-        COMING_EPS_DISPLAY_PAUSED = bool(check_setting_int(CFG, 'GUI', 'coming_eps_display_paused', 0))
-        COMING_EPS_SORT = check_setting_str(CFG, 'GUI', 'coming_eps_sort', 'date')
-
-        newznabData = check_setting_str(CFG, 'Newznab', 'newznab_data', '')
-        newznabProviderList = providers.getNewznabProviderList(newznabData)
-        providerList = providers.makeProviderList()
-
         # start up all the threads
         logger.sb_log_instance.initLogging(consoleLogging=consoleLogging)
 
         # initialize the main SB database
         db.upgradeDatabase(db.DBConnection(), mainDB.InitialSchema)
-        
+
         # initialize the cache database
         db.upgradeDatabase(db.DBConnection("cache.db"), cache_db.InitialSchema)
-        
+
         # fix up any db problems
         db.sanityCheckDatabase(db.DBConnection(), mainDB.MainSanityCheck)
 
@@ -715,13 +725,13 @@ def initialize(consoleLogging=True):
                                                                       runImmediately=True)
         backlogSearchScheduler.action.cycleTime = BACKLOG_SEARCH_FREQUENCY
 
-
         showList = []
         loadingShowList = {}
 
         __INITIALIZED__ = True
         return True
 
+
 def start():
 
     global __INITIALIZED__, currentSearchScheduler, backlogSearchScheduler, \
@@ -756,10 +766,11 @@ def start():
 
             # start the proper finder
             autoPostProcesserScheduler.thread.start()
-            
+
             started = True
 
-def halt ():
+
+def halt():
 
     global __INITIALIZED__, currentSearchScheduler, backlogSearchScheduler, showUpdateScheduler, \
             showQueueScheduler, properFinderScheduler, autoPostProcesserScheduler, searchQueueScheduler, \
@@ -829,7 +840,6 @@ def halt ():
             except:
                 pass
 
-
             __INITIALIZED__ = False
 
 
@@ -893,20 +903,22 @@ def saveAndShutdown(restart=False):
 
 def invoke_command(to_call, *args, **kwargs):
     global invoked_command
+
     def delegate():
         to_call(*args, **kwargs)
     invoked_command = delegate
-    logger.log(u"Placed invoked command: "+repr(invoked_command)+" for "+repr(to_call)+" with "+repr(args)+" and "+repr(kwargs), logger.DEBUG)
+    logger.log(u"Placed invoked command: " + repr(invoked_command) + " for " + repr(to_call) + " with " + repr(args) + " and " + repr(kwargs), logger.DEBUG)
+
 
 def invoke_restart(soft=True):
     invoke_command(restart, soft=soft)
 
+
 def invoke_shutdown():
     invoke_command(saveAndShutdown)
 
 
 def restart(soft=True):
-
     if soft:
         halt()
         saveAll()
@@ -919,7 +931,6 @@ def restart(soft=True):
         saveAndShutdown(restart=True)
 
 
-
 def save_config():
 
     new_config = ConfigObj()
@@ -974,7 +985,7 @@ def save_config():
     new_config['General']['rename_episodes'] = int(RENAME_EPISODES)
     new_config['General']['create_missing_show_dirs'] = CREATE_MISSING_SHOW_DIRS
     new_config['General']['add_shows_wo_dir'] = ADD_SHOWS_WO_DIR
-    
+
     new_config['General']['extra_scripts'] = '|'.join(EXTRA_SCRIPTS)
     new_config['General']['git_path'] = GIT_PATH
     new_config['General']['ignore_words'] = IGNORE_WORDS
@@ -985,7 +996,7 @@ def save_config():
 
     new_config['EZRSS'] = {}
     new_config['EZRSS']['ezrss'] = int(EZRSS)
-    
+
     new_config['TVTORRENTS'] = {}
     new_config['TVTORRENTS']['tvtorrents'] = int(TVTORRENTS)
     new_config['TVTORRENTS']['tvtorrents_digest'] = TVTORRENTS_DIGEST
@@ -1053,14 +1064,14 @@ def save_config():
     new_config['Growl'] = {}
     new_config['Growl']['use_growl'] = int(USE_GROWL)
     new_config['Growl']['growl_notify_onsnatch'] = int(GROWL_NOTIFY_ONSNATCH)
-    new_config['Growl']['growl_notify_ondownload'] = int(GROWL_NOTIFY_ONDOWNLOAD) 
+    new_config['Growl']['growl_notify_ondownload'] = int(GROWL_NOTIFY_ONDOWNLOAD)
     new_config['Growl']['growl_host'] = GROWL_HOST
     new_config['Growl']['growl_password'] = GROWL_PASSWORD
-    
+
     new_config['Prowl'] = {}
     new_config['Prowl']['use_prowl'] = int(USE_PROWL)
     new_config['Prowl']['prowl_notify_onsnatch'] = int(PROWL_NOTIFY_ONSNATCH)
-    new_config['Prowl']['prowl_notify_ondownload'] = int(PROWL_NOTIFY_ONDOWNLOAD) 
+    new_config['Prowl']['prowl_notify_ondownload'] = int(PROWL_NOTIFY_ONDOWNLOAD)
     new_config['Prowl']['prowl_api'] = PROWL_API
     new_config['Prowl']['prowl_priority'] = PROWL_PRIORITY
 
@@ -1155,12 +1166,12 @@ def launchBrowser(startPort=None):
         except:
             logger.log(u"Unable to launch a browser", logger.ERROR)
 
-def getEpList(epIDs, showid=None):
 
+def getEpList(epIDs, showid=None):
     if epIDs == None or len(epIDs) == 0:
         return []
 
-    query = "SELECT * FROM tv_episodes WHERE tvdbid in (%s)" % (",".join(['?']*len(epIDs)),)
+    query = "SELECT * FROM tv_episodes WHERE tvdbid in (%s)" % (",".join(['?'] * len(epIDs)),)
     params = epIDs
 
     if showid != None:
diff --git a/sickbeard/browser.py b/sickbeard/browser.py
index a2dbbaea48..531e4ae67a 100644
--- a/sickbeard/browser.py
+++ b/sickbeard/browser.py
@@ -47,7 +47,7 @@ def getWinDrives():
     return drives
 
 
-def foldersAtPath(path, includeParent = False):
+def foldersAtPath(path, includeParent=False):
     """ Returns a list of dictionaries with the folders contained at the given path
         Give the empty string as the path to list the contents of the root path
         under Unix this means "/", on Windows this will be a list of drive letters)
@@ -81,6 +81,12 @@ def foldersAtPath(path, includeParent = False):
 
     fileList = [{ 'name': filename, 'path': ek.ek(os.path.join, path, filename) } for filename in ek.ek(os.listdir, path)]
     fileList = filter(lambda entry: ek.ek(os.path.isdir, entry['path']), fileList)
+
+    # prune out directories to proect the user from doing stupid things (already lower case the dir to reduce calls)
+    hideList = ["boot", "bootmgr", "cache", "msocache", "recovery", "$recycle.bin", "recycler", "system volume information", "temporary internet files"] # windows specific
+    hideList += [".fseventd", ".spotlight", ".trashes", ".vol", "cachedmessages", "caches", "trash"] # osx specific
+    fileList = filter(lambda entry: entry['name'].lower() not in hideList, fileList)
+
     fileList = sorted(fileList, lambda x, y: cmp(os.path.basename(x['name']).lower(), os.path.basename(y['path']).lower()))
 
     entries = [{'current_path': path}]
@@ -90,6 +96,7 @@ def foldersAtPath(path, includeParent = False):
 
     return entries
 
+
 class WebFileBrowser:
 
     @cherrypy.expose
diff --git a/sickbeard/common.py b/sickbeard/common.py
index 445c8d1bf7..400d20aff1 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -58,6 +58,7 @@
 NAMING_DUPLICATE = 4
 NAMING_LIMITED_EXTEND = 8
 NAMING_SEPARATED_REPEAT = 16
+NAMING_LIMITED_EXTEND_E_PREFIXED = 32
 
 multiEpStrings = {}
 multiEpStrings[NAMING_REPEAT] = "Repeat"
@@ -65,6 +66,7 @@
 multiEpStrings[NAMING_DUPLICATE] = "Duplicate"
 multiEpStrings[NAMING_EXTEND] = "Extend"
 multiEpStrings[NAMING_LIMITED_EXTEND] = "Extend (Limited)"
+multiEpStrings[NAMING_LIMITED_EXTEND_E_PREFIXED] = "Extend (Limited, E-prefixed)"
 
 class Quality:
 
@@ -118,7 +120,7 @@ def splitQuality(quality):
             if curQual<<16 & quality:
                 bestQualities.append(curQual)
 
-        return (anyQualities, bestQualities)
+        return (sorted(anyQualities), sorted(bestQualities))
 
     @staticmethod
     def nameQuality(name):
@@ -155,7 +157,7 @@ def nameQuality(name):
     @staticmethod
     def assumeQuality(name):
 
-        if name.lower().endswith(".avi"):
+        if name.lower().endswith((".avi", ".mp4")):
             return Quality.SDTV
         elif name.lower().endswith(".mkv"):
             return Quality.HDTV
diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py
index 704016d773..21b04e344f 100644
--- a/sickbeard/name_parser/regexes.py
+++ b/sickbeard/name_parser/regexes.py
@@ -178,7 +178,7 @@
                '''
                ^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))?             # Show_Name and separator
                (?P<ep_num>\d{1,2})                           # 02
-               (?:-(?P<extra_ep_num>\d{1,2}))?               # 02
+               (?:-(?P<extra_ep_num>\d{1,2}))*               # 02
                [. _-]+((?P<extra_info>.+?)                 # Source_Quality_Etc-
                ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
                -(?P<release_group>[^- ]+))?)?$              # Group
diff --git a/sickbeard/naming.py b/sickbeard/naming.py
index eeea8db51d..fd0a3b528d 100644
--- a/sickbeard/naming.py
+++ b/sickbeard/naming.py
@@ -83,9 +83,11 @@ def check_valid_naming(pattern=None, multi=None):
     if pattern == None:
         pattern = sickbeard.NAMING_PATTERN
         
+    logger.log(u"Checking whether the pattern "+pattern+" is valid for a single episode", logger.DEBUG)
     valid = validate_name(pattern, None)
 
     if multi != None:
+        logger.log(u"Checking whether the pattern "+pattern+" is valid for a multi episode", logger.DEBUG)
         valid = valid and validate_name(pattern, multi)
 
     return valid
@@ -99,6 +101,7 @@ def check_valid_abd_naming(pattern=None):
     if pattern == None:
         pattern = sickbeard.NAMING_PATTERN
         
+    logger.log(u"Checking whether the pattern "+pattern+" is valid for an air-by-date episode", logger.DEBUG)
     valid = validate_name(pattern, abd=True)
 
     return valid
@@ -114,6 +117,10 @@ def validate_name(pattern, multi=None, file_only=False, abd=False):
     if not file_only:
         new_name = ek.ek(os.path.join, new_path, new_name)
 
+    if not new_name:
+        logger.log(u"Unable to create a name out of "+pattern, logger.DEBUG)
+        return False
+
     logger.log(u"Trying to parse "+new_name, logger.DEBUG)
 
     try:
@@ -122,15 +129,18 @@ def validate_name(pattern, multi=None, file_only=False, abd=False):
         logger.log(u"Unable to parse "+new_name+", not valid", logger.DEBUG)
         return False
     
-    logger.log(new_name + " vs " + str(result), logger.DEBUG)
+    logger.log("The name "+new_name + " parsed into " + str(result), logger.DEBUG)
 
     if abd:
         if result.air_date != ep.airdate:
+            logger.log(u"Air date incorrect in parsed episode, pattern isn't valid", logger.DEBUG)
             return False
     else:
         if result.season_number != ep.season:
+            logger.log(u"Season incorrect in parsed episode, pattern isn't valid", logger.DEBUG)
             return False
         if result.episode_numbers != [x.episode for x in [ep] + ep.relatedEps]:
+            logger.log(u"Episode incorrect in parsed episode, pattern isn't valid", logger.DEBUG)
             return False
 
     return True
diff --git a/sickbeard/notifiers/__init__.py b/sickbeard/notifiers/__init__.py
index 6e9228fa43..c78aaabfc6 100755
--- a/sickbeard/notifiers/__init__.py
+++ b/sickbeard/notifiers/__init__.py
@@ -20,61 +20,64 @@
 
 import xbmc
 import plex
+import nmj
+import synoindex
+import pytivo
+
 import growl
 import prowl
-import tweet
-from . import libnotify
 import notifo
-import boxcar
+from . import libnotify
 import pushover
-import nmj
-import synoindex
-import trakt
-import pytivo
+import boxcar
 import nma
 
+import tweet
+import trakt
+
 from sickbeard.common import *
 
+# home theater
 xbmc_notifier = xbmc.XBMCNotifier()
 plex_notifier = plex.PLEXNotifier()
+nmj_notifier = nmj.NMJNotifier()
+synoindex_notifier = synoindex.synoIndexNotifier()
+pytivo_notifier = pytivo.pyTivoNotifier()
+# devices
 growl_notifier = growl.GrowlNotifier()
 prowl_notifier = prowl.ProwlNotifier()
-twitter_notifier = tweet.TwitterNotifier()
 notifo_notifier = notifo.NotifoNotifier()
-boxcar_notifier = boxcar.BoxcarNotifier()
-pushover_notifier = pushover.PushoverNotifier()
 libnotify_notifier = libnotify.LibnotifyNotifier()
-nmj_notifier = nmj.NMJNotifier()
-synoindex_notifier = synoindex.synoIndexNotifier()
-trakt_notifier = trakt.TraktNotifier()
-pytivo_notifier = pytivo.pyTivoNotifier()
+pushover_notifier = pushover.PushoverNotifier()
+boxcar_notifier = boxcar.BoxcarNotifier()
 nma_notifier = nma.NMA_Notifier()
+# online
+twitter_notifier = tweet.TwitterNotifier()
+trakt_notifier = trakt.TraktNotifier()
 
 notifiers = [
-    # Libnotify notifier goes first because it doesn't involve blocking on
-    # network activity.
-    libnotify_notifier,
+    libnotify_notifier, # Libnotify notifier goes first because it doesn't involve blocking on network activity.
     xbmc_notifier,
     plex_notifier,
-    growl_notifier,
-    prowl_notifier,
-    twitter_notifier,
     nmj_notifier,
     synoindex_notifier,
-    boxcar_notifier,
-    pushover_notifier,
-    trakt_notifier,
     pytivo_notifier,
+    growl_notifier,
+    prowl_notifier,
+    notifo_notifier,
+    pushover_notifier,
+    boxcar_notifier,
     nma_notifier,
+    twitter_notifier,
+    trakt_notifier,
 ]
 
+
 def notify_download(ep_name):
     for n in notifiers:
         n.notify_download(ep_name)
-    notifo_notifier.notify_download(ep_name)
+
 
 def notify_snatch(ep_name):
     for n in notifiers:
         n.notify_snatch(ep_name)
-    notifo_notifier.notify_snatch(ep_name)
-
diff --git a/sickbeard/notifiers/nmj.py b/sickbeard/notifiers/nmj.py
index b84ae816cf..4a05815592 100644
--- a/sickbeard/notifiers/nmj.py
+++ b/sickbeard/notifiers/nmj.py
@@ -88,7 +88,8 @@ def notify_snatch(self, ep_name):
         #Not implemented: Start the scanner when snatched does not make any sense
 
     def notify_download(self, ep_name):
-        self._notifyNMJ()
+        if sickbeard.USE_NMJ:
+            self._notifyNMJ()
 
     def test_notify(self, host, database, mount):
         return self._sendNMJ(host, database, mount)
diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py
index d282667359..4d1b4362ef 100644
--- a/sickbeard/notifiers/plex.py
+++ b/sickbeard/notifiers/plex.py
@@ -17,76 +17,172 @@
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
 import urllib
+import urllib2
+import base64
+
 import sickbeard
 
-from sickbeard import logger, common
-from sickbeard.notifiers.xbmc import XBMCNotifier 
+from sickbeard import logger
+from sickbeard import common
 from sickbeard.exceptions import ex
+from sickbeard.encodingKludge import fixStupidEncodings
 
+# TODO: switch over to using ElementTree
 from xml.dom import minidom
 
-class PLEXNotifier(XBMCNotifier):
 
-    def notify_snatch(self, ep_name):
-        if sickbeard.PLEX_NOTIFY_ONSNATCH:
-            self._notifyXBMC(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+class PLEXNotifier:
 
-    def notify_download(self, ep_name):
-        if sickbeard.PLEX_NOTIFY_ONDOWNLOAD:
-            self._notifyXBMC(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+    def _send_to_plex(self, command, host, username=None, password=None):
+        """Handles communication to Plex hosts via HTTP API
 
-    def test_notify(self, host, username, password):
-        return self._update_library() 
-        
-    def update_library(self):
-        if sickbeard.PLEX_UPDATE_LIBRARY:
-            self._update_library()
+        Args:
+            command: Dictionary of field/data pairs, encoded via urllib and passed to the legacy xbmcCmds HTTP API
+            host: Plex host:port
+            username: Plex API username
+            password: Plex API password
 
-    def _username(self):
-        return sickbeard.PLEX_USERNAME
+        Returns:
+            Returns 'OK' for successful commands or False if there was an error
 
-    def _password(self):
-        return sickbeard.PLEX_PASSWORD
+        """
 
-    def _use_me(self):
-        return sickbeard.USE_PLEX
+        # fill in omitted parameters
+        if not username:
+            username = sickbeard.PLEX_USERNAME
+        if not password:
+            password = sickbeard.PLEX_PASSWORD
 
-    def _hostname(self):
-        return sickbeard.PLEX_HOST
+        if not host:
+            logger.log(u"No Plex host specified, check your settings", logger.DEBUG)
+            return False
 
+        for key in command:
+            if type(command[key]) == unicode:
+                command[key] = command[key].encode('utf-8')
 
-    def _update_library(self):
-        if not sickbeard.USE_PLEX:
-            logger.log(u"Notifications for Plex Media Server not enabled, skipping library update", logger.DEBUG)
-            return False
+        enc_command = urllib.urlencode(command)
+        logger.log(u"Plex encoded API command: " + enc_command, logger.DEBUG)
 
-        logger.log(u"Updating Plex Media Server library", logger.DEBUG)
+        url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, enc_command)
+        try:
+            req = urllib2.Request(url)
+            # if we have a password, use authentication
+            if password:
+                base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
+                authheader = "Basic %s" % base64string
+                req.add_header("Authorization", authheader)
+                logger.log(u"Contacting Plex (with auth header) via url: " + url, logger.DEBUG)
+            else:
+                logger.log(u"Contacting Plex via url: " + url, logger.DEBUG)
+
+            response = urllib2.urlopen(req)
+
+            result = response.read().decode(sickbeard.SYS_ENCODING)
+            response.close()
+
+            logger.log(u"Plex HTTP response: " + result.replace('\n', ''), logger.DEBUG)
+            # could return result response = re.compile('<html><li>(.+\w)</html>').findall(result)
+            return 'OK'
+
+        except (urllib2.URLError, IOError), e:
+            logger.log(u"Warning: Couldn't contact Plex at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
+            return False
 
-        if not sickbeard.PLEX_SERVER_HOST:
-            logger.log(u"No host specified, no updates done", logger.DEBUG)
+    def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
+        """Internal wrapper for the notify_snatch and notify_download functions
+
+        Args:
+            message: Message body of the notice to send
+            title: Title of the notice to send
+            host: Plex Media Client(s) host:port
+            username: Plex username
+            password: Plex password
+            force: Used for the Test method to override config saftey checks
+
+        Returns:
+            Returns a list results in the format of host:ip:result
+            The result will either be 'OK' or False, this is used to be parsed by the calling function.
+
+        """
+
+        # fill in omitted parameters
+        if not host:
+            host = sickbeard.PLEX_HOST
+        if not username:
+            username = sickbeard.PLEX_USERNAME
+        if not password:
+            password = sickbeard.PLEX_PASSWORD
+
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_PLEX and not force:
+            logger.log("Notification for Plex not enabled, skipping this notification", logger.DEBUG)
             return False
 
-        logger.log(u"Plex Media Server updating " + sickbeard.PLEX_SERVER_HOST, logger.DEBUG)
+        result = ''
+        for curHost in [x.strip() for x in host.split(",")]:
+            logger.log(u"Sending Plex notification to '" + curHost + "' - " + message, logger.MESSAGE)
 
-        url = "http://%s/library/sections" % sickbeard.PLEX_SERVER_HOST
-        try:
-            xml_sections = minidom.parse(urllib.urlopen(url))
-        except IOError, e:
-            logger.log(u"Error while trying to contact your plex server: "+ex(e), logger.ERROR)
-            return False
+            command = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + title.encode("utf-8") + ',' + message.encode("utf-8") + ')'}
+            notifyResult = self._send_to_plex(command, curHost, username, password)
+            if notifyResult:
+                result += curHost + ':' + str(notifyResult)
+
+        return result
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.PLEX_NOTIFY_ONSNATCH:
+            self._notify_pmc(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+
+    def notify_download(self, ep_name):
+        if sickbeard.PLEX_NOTIFY_ONDOWNLOAD:
+            self._notify_pmc(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+
+    def test_notify(self, host, username, password):
+        return self._notify_pmc("Testing Plex notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+
+    def update_library(self):
+        """Handles updating the Plex Media Server host via HTTP API
+
+        Plex Media Server currently only supports updating the whole video library and not a specific path.
+
+        Returns:
+            Returns True or False
+
+        """
+
+        if sickbeard.USE_PLEX and sickbeard.PLEX_UPDATE_LIBRARY:
+            if not sickbeard.PLEX_SERVER_HOST:
+                logger.log(u"No Plex Server host specified, check your settings", logger.DEBUG)
+                return False
+
+            logger.log(u"Updating library for the Plex Media Server host: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
 
-        sections = xml_sections.getElementsByTagName('Directory')
+            url = "http://%s/library/sections" % sickbeard.PLEX_SERVER_HOST
+            try:
+                xml_sections = minidom.parse(urllib.urlopen(url))
+            except IOError, e:
+                logger.log(u"Error while trying to contact Plex Media Server: " + ex(e), logger.ERROR)
+                return False
 
-        for s in sections:
-            if s.getAttribute('type') == "show":
-                url = "http://%s/library/sections/%s/refresh" % (sickbeard.PLEX_SERVER_HOST, s.getAttribute('key'))
+            sections = xml_sections.getElementsByTagName('Directory')
+            if not sections:
+                logger.log(u"Plex Media Server not running on: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
+                return False
 
-                try:
-                    urllib.urlopen(url)
-                except Exception, e:
-                    logger.log(u"Error updating library section: "+ex(e), logger.ERROR)
-                    return False
+            for s in sections:
+                if s.getAttribute('type') == "show":
+                    url = "http://%s/library/sections/%s/refresh" % (sickbeard.PLEX_SERVER_HOST, s.getAttribute('key'))
+                    try:
+                        urllib.urlopen(url)
+                    except Exception, e:
+                        logger.log(u"Error updating library section for Plex Media Server: " + ex(e), logger.ERROR)
+                        return False
 
-        return True
+            return True
 
 notifier = PLEXNotifier
diff --git a/sickbeard/notifiers/xbmc.py b/sickbeard/notifiers/xbmc.py
index 9747f99525..05c63d106f 100644
--- a/sickbeard/notifiers/xbmc.py
+++ b/sickbeard/notifiers/xbmc.py
@@ -16,11 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-
-import urllib, urllib2
+import urllib
+import urllib2
 import socket
 import base64
-import time, struct
+import time
 
 import sickbeard
 
@@ -34,226 +34,460 @@
 except ImportError:
     import xml.etree.ElementTree as etree
 
+try:
+    import json
+except ImportError:
+    from lib import simplejson as json
+
+
 class XBMCNotifier:
 
-    def notify_snatch(self, ep_name):
-        if sickbeard.XBMC_NOTIFY_ONSNATCH:
-            self._notifyXBMC(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+    def _get_json_version(self, host, username, password):
+        """Returns XBMC JSON-RPC API version (odd # = dev, even # = stable)
 
-    def notify_download(self, ep_name):
-        if sickbeard.XBMC_NOTIFY_ONDOWNLOAD:
-            self._notifyXBMC(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+        Sends a request to the XBMC host using the JSON-RPC to determine if
+        the legacy API or if the JSON-RPC API functions should be used.
 
-    def test_notify(self, host, username, password):
-        return self._notifyXBMC("Testing XBMC notifications from Sick Beard", "Test Notification", host, username, password, force=True)
-
-    def update_library(self, show_name):
-        if sickbeard.XBMC_UPDATE_LIBRARY:
-            for curHost in [x.strip() for x in sickbeard.XBMC_HOST.split(",")]:
-                # do a per-show update first, if possible
-                if not self._update_library(curHost, showName=show_name) and sickbeard.XBMC_UPDATE_FULL:
-                    # do a full update if requested
-                    self._update_library(curHost)
-
-    def _username(self):
-        return sickbeard.XBMC_USERNAME
-
-    def _password(self):
-        return sickbeard.XBMC_PASSWORD
-
-    def _use_me(self):
-        return sickbeard.USE_XBMC
-
-    def _hostname(self):
-        return sickbeard.XBMC_HOST
-
-    def _sendToXBMC(self, command, host, username=None, password=None):
-        '''
-        Handles communication with XBMC servers
-    
-        command - Dictionary of field/data pairs, encoded via urllib.urlencode and
-        passed to /xbmcCmds/xbmcHttp
-    
-        host - host/ip + port (foo:8080)
-        '''
-    
+        Args:
+            host: XBMC webserver host:port
+            username: XBMC webserver username
+            password: XBMC webserver password
+
+        Returns:
+            Returns API number or False
+
+            List of possible known values:
+                API | XBMC Version
+               -----+---------------
+                 2  | v10 (Dharma)
+                 3  | (pre Eden)
+                 4  | v11 (Eden)
+                 5  | (pre Frodo)
+                 6  | v12 (Frodo)
+
+        """
+
+        # since we need to maintain python 2.5 compatability we can not pass a timeout delay to urllib2 directly (python 2.6+)
+        # override socket timeout to reduce delay for this call alone
+        socket.setdefaulttimeout(10)
+
+        checkCommand = '{"jsonrpc":"2.0","method":"JSONRPC.Version","id":1}'
+        result = self._send_to_xbmc_json(checkCommand, host, username, password)
+
+        # revert back to default socket timeout
+        socket.setdefaulttimeout(sickbeard.SOCKET_TIMEOUT)
+
+        if result:
+            return result["result"]["version"]
+        else:
+            return False
+
+    def _notify_xbmc(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
+        """Internal wrapper for the notify_snatch and notify_download functions
+
+        Detects JSON-RPC version then branches the logic for either the JSON-RPC or legacy HTTP API methods.
+
+        Args:
+            message: Message body of the notice to send
+            title: Title of the notice to send
+            host: XBMC webserver host:port
+            username: XBMC webserver username
+            password: XBMC webserver password
+            force: Used for the Test method to override config saftey checks
+
+        Returns:
+            Returns a list results in the format of host:ip:result
+            The result will either be 'OK' or False, this is used to be parsed by the calling function.
+
+        """
+
+        # fill in omitted parameters
+        if not host:
+            host = sickbeard.XBMC_HOST
         if not username:
-            username = self._username()
+            username = sickbeard.XBMC_USERNAME
         if not password:
-            password = self._password()
-    
+            password = sickbeard.XBMC_PASSWORD
+
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_XBMC and not force:
+            logger.log("Notification for XBMC not enabled, skipping this notification", logger.DEBUG)
+            return False
+
+        result = ''
+        for curHost in [x.strip() for x in host.split(",")]:
+            logger.log(u"Sending XBMC notification to '" + curHost + "' - " + message, logger.MESSAGE)
+
+            xbmcapi = self._get_json_version(curHost, username, password)
+            if xbmcapi:
+                if (xbmcapi <= 4):
+                    logger.log(u"Detected XBMC version <= 11, using XBMC HTTP API", logger.DEBUG)
+                    command = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + title.encode("utf-8") + ',' + message.encode("utf-8") + ')'}
+                    notifyResult = self._send_to_xbmc(command, curHost, username, password)
+                    if notifyResult:
+                        result += curHost + ':' + str(notifyResult)
+                else:
+                    logger.log(u"Detected XBMC version >= 12, using XBMC JSON API", logger.DEBUG)
+                    command = '{"jsonrpc":"2.0","method":"GUI.ShowNotification","params":{"title":"%s","message":"%s"},"id":1}' % (title.encode("utf-8"), message.encode("utf-8"))
+                    notifyResult = self._send_to_xbmc_json(command, curHost, username, password)
+                    if notifyResult:
+                        result += curHost + ':' + notifyResult["result"].decode(sickbeard.SYS_ENCODING)
+            else:
+                logger.log(u"Failed to detect XBMC version for '" + curHost + "', check configuration and try again.", logger.DEBUG)
+
+        return result
+
+##############################################################################
+# Legacy HTTP API (pre XBMC 12) methods
+##############################################################################
+
+    def _send_to_xbmc(self, command, host=None, username=None, password=None):
+        """Handles communication to XBMC servers via HTTP API
+
+        Args:
+            command: Dictionary of field/data pairs, encoded via urllib and passed to the XBMC API via HTTP
+            host: XBMC webserver host:port
+            username: XBMC webserver username
+            password: XBMC webserver password
+
+        Returns:
+            Returns response.result for successful commands or False if there was an error
+
+        """
+
+        # fill in omitted parameters
+        if not username:
+            username = sickbeard.XBMC_USERNAME
+        if not password:
+            password = sickbeard.XBMC_PASSWORD
+
+        if not host:
+            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            return False
+
         for key in command:
             if type(command[key]) == unicode:
                 command[key] = command[key].encode('utf-8')
-    
+
         enc_command = urllib.urlencode(command)
-        logger.log(u"Encoded command is " + enc_command, logger.DEBUG)
-        # Web server doesn't like POST, GET is the way to go
+        logger.log(u"XBMC encoded API command: " + enc_command, logger.DEBUG)
+
         url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, enc_command)
-    
         try:
-            # If we have a password, use authentication
             req = urllib2.Request(url)
+            # if we have a password, use authentication
             if password:
-                logger.log(u"Adding Password to XBMC url", logger.DEBUG)
                 base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
-                authheader =  "Basic %s" % base64string
+                authheader = "Basic %s" % base64string
                 req.add_header("Authorization", authheader)
-    
-            logger.log(u"Contacting XBMC via url: " + url, logger.DEBUG)
-            handle = urllib2.urlopen(req)
-            response = handle.read().decode(sickbeard.SYS_ENCODING)
-            logger.log(u"response: " + response, logger.DEBUG)
-        except IOError, e:
-            logger.log(u"Warning: Couldn't contact XBMC HTTP server at " + fixStupidEncodings(host) + ": " + ex(e))
-            response = ''
-    
-        return response
-
-    def _notifyXBMC(self, input, title="Sick Beard", host=None, username=None, password=None, force=False):
-    
-        if not self._use_me() and not force:
-            logger.log("Notification for XBMC not enabled, skipping this notification", logger.DEBUG)
-            return False
-    
-        if not host:
-            host = self._hostname()
-        if not username:
-            username = self._username()
-        if not password:
-            password = self._password()
-    
-        logger.log(u"Sending notification for " + input, logger.DEBUG)
-    
-        fileString = title + "," + input
-    
-        result = ''
-    
-        for curHost in [x.strip() for x in host.split(",")]:
-            command = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' +fileString + ')' }
-            logger.log(u"Sending notification to XBMC via host: "+ curHost +"username: "+ username + " password: " + password, logger.DEBUG)
-            if result:
-                result += ', '
-            result += curHost + ':' + self._sendToXBMC(command, curHost, username, password)
+                logger.log(u"Contacting XBMC (with auth header) via url: " + fixStupidEncodings(url), logger.DEBUG)
+            else:
+                logger.log(u"Contacting XBMC via url: " + fixStupidEncodings(url), logger.DEBUG)
 
-        return result
+            response = urllib2.urlopen(req)
+            result = response.read().decode(sickbeard.SYS_ENCODING)
+            response.close()
+
+            logger.log(u"XBMC HTTP response: " + result.replace('\n', ''), logger.DEBUG)
+            return result
 
-    def _update_library(self, host, showName=None):
-    
-        if not self._use_me():
-            logger.log("Notifications for XBMC not enabled, skipping library update", logger.DEBUG)
+        except (urllib2.URLError, IOError), e:
+            logger.log(u"Warning: Couldn't contact XBMC HTTP at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
             return False
-    
-        logger.log(u"Updating library in XBMC", logger.DEBUG)
-    
+
+    def _update_library(self, host=None, showName=None):
+        """Handles updating XBMC host via HTTP API
+
+        Attempts to update the XBMC video library for a specific tv show if passed,
+        otherwise update the whole library if enabled.
+
+        Args:
+            host: XBMC webserver host:port
+            showName: Name of a TV show to specifically target the library update for
+
+        Returns:
+            Returns True or False
+
+        """
+
         if not host:
-            logger.log('No host specified, no updates done', logger.DEBUG)
+            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
             return False
-    
+
+        logger.log(u"Updating XMBC library via HTTP method for host: " + host, logger.DEBUG)
+
         # if we're doing per-show
         if showName:
+            logger.log(u"Updating library in XBMC via HTTP method for show " + showName, logger.DEBUG)
+
             pathSql = 'select path.strPath from path, tvshow, tvshowlinkpath where ' \
                 'tvshow.c00 = "%s" and tvshowlinkpath.idShow = tvshow.idShow ' \
                 'and tvshowlinkpath.idPath = path.idPath' % (showName)
-    
-            # Use this to get xml back for the path lookups
+
+            # use this to get xml back for the path lookups
             xmlCommand = {'command': 'SetResponseFormat(webheader;false;webfooter;false;header;<xml>;footer;</xml>;opentag;<tag>;closetag;</tag>;closefinaltag;false)'}
-            # Sql used to grab path(s)
+            # sql used to grab path(s)
             sqlCommand = {'command': 'QueryVideoDatabase(%s)' % (pathSql)}
-            # Set output back to default
+            # set output back to default
             resetCommand = {'command': 'SetResponseFormat()'}
-    
-            # Set xml response format, if this fails then don't bother with the rest
-            request = self._sendToXBMC(xmlCommand, host)
+
+            # set xml response format, if this fails then don't bother with the rest
+            request = self._send_to_xbmc(xmlCommand, host)
             if not request:
                 return False
-    
-            sqlXML = self._sendToXBMC(sqlCommand, host)
-            request = self._sendToXBMC(resetCommand, host)
-    
+
+            sqlXML = self._send_to_xbmc(sqlCommand, host)
+            request = self._send_to_xbmc(resetCommand, host)
+
             if not sqlXML:
                 logger.log(u"Invalid response for " + showName + " on " + host, logger.DEBUG)
                 return False
-    
-            encSqlXML = urllib.quote(sqlXML,':\\/<>')
+
+            encSqlXML = urllib.quote(sqlXML, ':\\/<>')
             try:
                 et = etree.fromstring(encSqlXML)
             except SyntaxError, e:
-                logger.log("Unable to parse XML returned from XBMC: "+ex(e), logger.ERROR)
+                logger.log(u"Unable to parse XML returned from XBMC: " + ex(e), logger.ERROR)
                 return False
-    
+
             paths = et.findall('.//field')
-    
+
             if not paths:
                 logger.log(u"No valid paths found for " + showName + " on " + host, logger.DEBUG)
                 return False
-    
+
             for path in paths:
                 # Don't need it double-encoded, gawd this is dumb
                 unEncPath = urllib.unquote(path.text).decode(sickbeard.SYS_ENCODING)
                 logger.log(u"XBMC Updating " + showName + " on " + host + " at " + unEncPath, logger.DEBUG)
                 updateCommand = {'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video, %s)' % (unEncPath)}
-                request = self._sendToXBMC(updateCommand, host)
+                request = self._send_to_xbmc(updateCommand, host)
                 if not request:
                     logger.log(u"Update of show directory failed on " + showName + " on " + host + " at " + unEncPath, logger.ERROR)
                     return False
-                # Sleep for a few seconds just to be sure xbmc has a chance to finish
-                # each directory
+                # sleep for a few seconds just to be sure xbmc has a chance to finish each directory
                 if len(paths) > 1:
                     time.sleep(5)
+        # do a full update if requested
         else:
-            logger.log(u"Do a full update as requested", logger.DEBUG)
-            logger.log(u"XBMC Updating " + host, logger.DEBUG)
+            logger.log(u"Doing Full Library XBMC update on host: " + host, logger.DEBUG)
             updateCommand = {'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video)'}
-            request = self._sendToXBMC(updateCommand, host)
-    
+            request = self._send_to_xbmc(updateCommand, host)
+
             if not request:
-                logger.log(u"Full update failed on " + host, logger.ERROR)
+                logger.log(u"XBMC Full Library update failed on: " + host, logger.ERROR)
                 return False
-    
+
         return True
 
-# Wake function
-def wakeOnLan(ethernet_address):
-    addr_byte = ethernet_address.split(':')
-    hw_addr = struct.pack('BBBBBB', int(addr_byte[0], 16),
-    int(addr_byte[1], 16),
-    int(addr_byte[2], 16),
-    int(addr_byte[3], 16),
-    int(addr_byte[4], 16),
-    int(addr_byte[5], 16))
+##############################################################################
+# JSON-RPC API (XBMC 12+) methods
+##############################################################################
+
+    def _send_to_xbmc_json(self, command, host=None, username=None, password=None):
+        """Handles communication to XBMC servers via JSONRPC
+
+        Args:
+            command: Dictionary of field/data pairs, encoded via urllib and passed to the XBMC JSON-RPC via HTTP
+            host: XBMC webserver host:port
+            username: XBMC webserver username
+            password: XBMC webserver password
+
+        Returns:
+            Returns response.result for successful commands or False if there was an error
+
+        """
+
+        # fill in omitted parameters
+        if not username:
+            username = sickbeard.XBMC_USERNAME
+        if not password:
+            password = sickbeard.XBMC_PASSWORD
+
+        if not host:
+            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            return False
+
+        command = command.encode('utf-8')
+        logger.log(u"XBMC JSON command: " + command, logger.DEBUG)
+
+        url = 'http://%s/jsonrpc' % (host)
+        try:
+            req = urllib2.Request(url, command)
+            req.add_header("Content-type", "application/json")
+            # if we have a password, use authentication
+            if password:
+                base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
+                authheader = "Basic %s" % base64string
+                req.add_header("Authorization", authheader)
+                logger.log(u"Contacting XBMC (with auth header) via url: " + fixStupidEncodings(url), logger.DEBUG)
+            else:
+                logger.log(u"Contacting XBMC via url: " + fixStupidEncodings(url), logger.DEBUG)
+
+            try:
+                response = urllib2.urlopen(req)
+            except urllib2.URLError, e:
+                logger.log(u"Error while trying to retrieve XBMC API version for " + host + ": " + ex(e), logger.WARNING)
+                return False
+
+            # parse the json result
+            try:
+                result = json.load(response)
+                response.close()
+                logger.log(u"XBMC JSON response: " + str(result), logger.DEBUG)
+                return result # need to return response for parsing
+            except ValueError, e:
+                logger.log(u"Unable to decode JSON: " + response, logger.WARNING)
+                return False
+
+        except IOError, e:
+            logger.log(u"Warning: Couldn't contact XBMC JSON API at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
+            return False
+
+    def _update_library_json(self, host=None, showName=None):
+        """Handles updating XBMC host via HTTP JSON-RPC
 
-    # Build the Wake-On-LAN "Magic Packet"...
-    msg = '\xff' * 6 + hw_addr * 16
+        Attempts to update the XBMC video library for a specific tv show if passed,
+        otherwise update the whole library if enabled.
 
-    # ...and send it to the broadcast address using UDP
-    ss = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    ss.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-    ss.sendto(msg, ('<broadcast>', 9))
-    ss.close()
+        Args:
+            host: XBMC webserver host:port
+            showName: Name of a TV show to specifically target the library update for
 
-# Test Connection function
-def isHostUp(host,port):
+        Returns:
+            Returns True or False
 
-    (family, socktype, proto, garbage, address) = socket.getaddrinfo(host, port)[0] #@UnusedVariable
-    s = socket.socket(family, socktype, proto)
+        """
+
+        if not host:
+            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            return False
+
+        logger.log(u"Updating XMBC library via JSON method for host: " + host, logger.MESSAGE)
+
+        # if we're doing per-show
+        if showName:
+            tvshowid = -1
+            logger.log(u"Updating library in XBMC via JSON method for show " + showName, logger.DEBUG)
+
+            # get tvshowid by showName
+            showsCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.GetTVShows","id":1}'
+            showsResponse = self._send_to_xbmc_json(showsCommand, host)
+            if (showsResponse == False):
+                return False
+            shows = showsResponse["result"]["tvshows"]
 
-    try:
-        s.connect(address)
-        return "Up"
-    except:
-        return "Down"
+            for show in shows:
+                if (show["label"] == showName):
+                    tvshowid = show["tvshowid"]
+                    break # exit out of loop otherwise the label and showname will not match up
 
+            # this can be big, so free some memory
+            del shows
 
-def checkHost(host, port):
+            # we didn't find the show (exact match), thus revert to just doing a full update if enabled
+            if (tvshowid == -1):
+                logger.log(u'Exact show name not matched in XBMC TV show list', logger.DEBUG)
+                return False
+
+            # lookup tv-show path
+            pathCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.GetTVShowDetails","params":{"tvshowid":%d, "properties": ["file"]},"id":1}' % (tvshowid)
+            pathResponse = self._send_to_xbmc_json(pathCommand, host)
+
+            path = pathResponse["result"]["tvshowdetails"]["file"]
+            logger.log(u"Received Show: " + show["label"] + " with ID: " + str(tvshowid) + " Path: " + path, logger.DEBUG)
+
+            if (len(path) < 1):
+                logger.log(u"No valid path found for " + showName + " with ID: " + str(tvshowid) + " on " + host, logger.WARNING)
+                return False
+
+            logger.log(u"XBMC Updating " + showName + " on " + host + " at " + path, logger.DEBUG)
+            updateCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.Scan","params":{"directory":%s},"id":1}' % (json.dumps(path))
+            request = self._send_to_xbmc_json(updateCommand, host)
+            if not request:
+                logger.log(u"Update of show directory failed on " + showName + " on " + host + " at " + path, logger.ERROR)
+                return False
+
+            # catch if there was an error in the returned request
+            for r in request:
+                if 'error' in r:
+                    logger.log(u"Error while attempting to update show directory for " + showName + " on " + host + " at " + path, logger.ERROR)
+                    return False
+
+        # do a full update if requested
+        else:
+            logger.log(u"Doing Full Library XBMC update on host: " + host, logger.MESSAGE)
+            updateCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.Scan","id":1}'
+            request = self._send_to_xbmc_json(updateCommand, host, sickbeard.XBMC_USERNAME, sickbeard.XBMC_PASSWORD)
+
+            if not request:
+                logger.log(u"XBMC Full Library update failed on: " + host, logger.ERROR)
+                return False
+
+        return True
+
+##############################################################################
+# Public functions which will call the JSON or Legacy HTTP API methods
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.XBMC_NOTIFY_ONSNATCH:
+            self._notify_xbmc(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+
+    def notify_download(self, ep_name):
+        if sickbeard.XBMC_NOTIFY_ONDOWNLOAD:
+            self._notify_xbmc(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+
+    def test_notify(self, host, username, password):
+        return self._notify_xbmc("Testing XBMC notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+
+    def update_library(self, showName=None):
+        """Public wrapper for the update library functions to branch the logic for JSON-RPC or legacy HTTP API
+
+        Checks the XBMC API version to branch the logic to call either the legacy HTTP API or the newer JSON-RPC over HTTP methods.
+        Do the ability of accepting a list of hosts deliminated by comma, we split off the first host to send the update to.
+        This is a workaround for SQL backend users as updating multiple clients causes duplicate entries.
+        Future plan is to revist how we store the host/ip/username/pw/options so that it may be more flexible.
+
+        Args:
+            showName: Name of a TV show to specifically target the library update for
+
+        Returns:
+            Returns True or False
+
+        """
+
+        if sickbeard.USE_XBMC and sickbeard.XBMC_UPDATE_LIBRARY:
+            if not sickbeard.XBMC_HOST:
+                logger.log(u"No XBMC hosts specified, check your settings", logger.DEBUG)
+                return False
+
+            # only send update to first host in the list -- workaround for xbmc sql backend users
+            host = sickbeard.XBMC_HOST.split(",")[0].strip()
+
+            logger.log(u"Sending request to update library for XBMC host: '" + host + "'", logger.MESSAGE)
+
+            xbmcapi = self._get_json_version(host, sickbeard.XBMC_USERNAME, sickbeard.XBMC_PASSWORD)
+            if xbmcapi:
+                if (xbmcapi <= 4):
+                    # try to update for just the show, if it fails, do full update if enabled
+                    if not self._update_library(host, showName) and sickbeard.XBMC_UPDATE_FULL:
+                        logger.log(u"Single show update failed, falling back to full update", logger.WARNING)
+                        return self._update_library(host)
+                    else:
+                        return True
+                else:
+                    # try to update for just the show, if it fails, do full update if enabled
+                    if not self._update_library_json(host, showName) and sickbeard.XBMC_UPDATE_FULL:
+                        logger.log(u"Single show update failed, falling back to full update", logger.WARNING)
+                        return self._update_library_json(host)
+                    else:
+                        return True
+            else:
+                logger.log(u"Failed to detect XBMC version for '" + host + "', check configuration and try again.", logger.DEBUG)
+                return False
 
-    # we should try to get this programmatically from the IP
-    mac = ""
+            return True
 
-    i=1
-    while isHostUp(host,port)=="Down" and i<4:
-        wakeOnLan(mac)
-        time.sleep(20)
-        i=i+1
 
-notifier = XBMCNotifier
\ No newline at end of file
+notifier = XBMCNotifier
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 90bad08ff8..00cbaad427 100755
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -852,20 +852,23 @@ def process(self):
         ep_obj.createMetaFiles()
         ep_obj.saveToDB()
 
-        # do the library update
-        notifiers.xbmc_notifier.update_library(ep_obj.show.name)
-
-        # do the library update for Plex Media Server
-        notifiers.plex_notifier.update_library()
+        # do the library update for XBMC
+        notifiers.xbmc_notifier.update_library(ep_obj.show.name)
+
+        # do the library update for Plex
+        notifiers.plex_notifier.update_library()
 
-        # do the library update for synoindex
+        # do the library update for NMJ
+        # nmj_notifier kicks off its library update when the notify_download is issued (inside notifiers)
+
+        # do the library update for Synology Indexer
         notifiers.synoindex_notifier.addFile(ep_obj.location)
-
-        # do the library update for trakt
-        notifiers.trakt_notifier.update_library(ep_obj)
 
         # do the library update for pyTivo
         notifiers.pytivo_notifier.update_library(ep_obj)
+
+        # do the library update for Trakt
+        notifiers.trakt_notifier.update_library(ep_obj)
 
         self._run_extra_scripts(ep_obj)
 
diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
index 3cbba8e728..05e147212d 100644
--- a/sickbeard/properFinder.py
+++ b/sickbeard/properFinder.py
@@ -115,6 +115,9 @@ def _getProperList(self):
             # for each show in our list
             for curShow in sickbeard.showList:
 
+                if not parse_result.series_name:
+                    continue
+
                 genericName = self._genericName(parse_result.series_name)
 
                 # get the scene name masks
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index 38abc6ef6c..56fac153bf 100755
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -18,11 +18,8 @@
 
 __all__ = ['ezrss',
            'tvtorrents',
-           'nzbmatrix',
-           'nzbs_org_old',
            'nzbsrus',
            'womble',
-           'newzbin',
            'btn',
            ]
 
diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
index 07aa18fdad..b696889d7a 100644
--- a/sickbeard/providers/newznab.py
+++ b/sickbeard/providers/newznab.py
@@ -86,7 +86,7 @@ def _get_season_search_strings(self, show, season=None):
                 cur_params['rid'] = show.tvrid
             # if we can't then fall back on a very basic name search
             else:
-                cur_params['q'] = helpers.sanitizeSceneName(cur_exception).replace('.', '_')
+                cur_params['q'] = helpers.sanitizeSceneName(cur_exception)
 
             if season != None:
                 # air-by-date means &season=2010&q=2010.03, no other way to do it atm
@@ -117,7 +117,7 @@ def _get_episode_search_strings(self, ep_obj):
             params['rid'] = ep_obj.show.tvrid
         # if we can't then fall back on a very basic name search
         else:
-            params['q'] = helpers.sanitizeSceneName(ep_obj.show.name).replace('.', '_')
+            params['q'] = helpers.sanitizeSceneName(ep_obj.show.name)
 
         if ep_obj.show.air_by_date:
             date_str = str(ep_obj.airdate)
@@ -142,7 +142,7 @@ def _get_episode_search_strings(self, ep_obj):
                     continue
 
                 cur_return = params.copy()
-                cur_return['q'] = helpers.sanitizeSceneName(cur_exception).replace('.', '_')
+                cur_return['q'] = helpers.sanitizeSceneName(cur_exception)
                 to_return.append(cur_return)
 
         return to_return
diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index ce92424a06..e4f14007b0 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -132,7 +132,7 @@ def searchBacklog(self, which_shows=None):
 
         # don't consider this an actual backlog search if we only did recent eps
         # or if we only did certain shows
-        if fromDate == datetime.date.fromordinal(1) or not which_shows:
+        if fromDate == datetime.date.fromordinal(1) and not which_shows:
             self._set_lastBacklog(curDate)
 
         self.amActive = False
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index 1916915241..4d7a28dbed 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -219,10 +219,16 @@ def execute(self):
                 t = tvdb_api.Tvdb(**ltvdb_api_parms)
                 s = t[self.tvdb_id]
 
-                # this usually only happens if they have an NFO in their show dir which gave us a TVDB ID that has no
-                # proper english version of the show
-                if not s or not s['seriesname']:
-                    ui.notifications.error("Unable to add show", "Show in "+self.showDir+" has no name on TVDB, probably the wrong language. Delete .nfo and add manually in the correct language.")
+                # this usually only happens if they have an NFO in their show dir which gave us a TVDB ID that has no proper english version of the show
+                if not s['seriesname']:
+                    logger.log(u"Show in " + self.showDir + " has no name on TVDB, probably the wrong language used to search with.", logger.ERROR)
+                    ui.notifications.error("Unable to add show", "Show in " + self.showDir + " has no name on TVDB, probably the wrong language. Delete .nfo and add manually in the correct language.")
+                    self._finishEarly()
+                    return
+                # if the show has no episodes/seasons
+                if not s:
+                    logger.log(u"Show " + str(s['seriesname']) + " is on TVDB but contains no season/episode data.", logger.ERROR)
+                    ui.notifications.error("Unable to add show", "Show " + str(s['seriesname']) + " is on TVDB but contains no season/episode data.")
                     self._finishEarly()
                     return
             except tvdb_exceptions.tvdb_exception, e:
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 8a19c251f1..e4527cdc06 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -43,7 +43,7 @@
 
 from common import Quality, Overview
 from common import DOWNLOADED, SNATCHED, SNATCHED_PROPER, ARCHIVED, IGNORED, UNAIRED, WANTED, SKIPPED, UNKNOWN
-from common import NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_SEPARATED_REPEAT
+from common import NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_SEPARATED_REPEAT, NAMING_LIMITED_EXTEND_E_PREFIXED
 
 class TVShow(object):
 
@@ -1137,7 +1137,7 @@ def loadFromTVDB(self, season=None, episode=None, cache=True, tvapi=None, cached
             return
 
 
-        if not myEp["firstaired"]:
+        if not myEp["firstaired"] or myEp["firstaired"] == "0000-00-00":
             myEp["firstaired"] = str(datetime.date.fromordinal(1))
 
         if myEp["episodename"] == None or myEp["episodename"] == "":
@@ -1516,8 +1516,6 @@ def _format_pattern(self, pattern=None, multi=None):
         Manipulates an episode naming pattern and then fills the template in
         """
         
-        logger.log(u"pattern: "+pattern, logger.DEBUG)
-        
         if pattern == None:
             pattern = sickbeard.NAMING_PATTERN
         
@@ -1574,7 +1572,7 @@ def _format_pattern(self, pattern=None, multi=None):
                     sep = ' '
 
                 # force 2-3-4 format if they chose to extend
-                if multi in (NAMING_EXTEND, NAMING_LIMITED_EXTEND):
+                if multi in (NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_LIMITED_EXTEND_E_PREFIXED):
                     ep_sep = '-'
                 
                 regex_used = season_ep_regex
@@ -1599,7 +1597,7 @@ def _format_pattern(self, pattern=None, multi=None):
             for other_ep in self.relatedEps:
                 
                 # for limited extend we only append the last ep
-                if multi == NAMING_LIMITED_EXTEND and other_ep != self.relatedEps[-1]:
+                if multi in (NAMING_LIMITED_EXTEND, NAMING_LIMITED_EXTEND_E_PREFIXED) and other_ep != self.relatedEps[-1]:
                     continue
                 
                 elif multi == NAMING_DUPLICATE:
@@ -1611,6 +1609,10 @@ def _format_pattern(self, pattern=None, multi=None):
 
                 # add "E04"
                 ep_string += ep_sep
+
+                if multi == NAMING_LIMITED_EXTEND_E_PREFIXED:
+                    ep_string += 'E'
+
                 ep_string += other_ep._format_string(ep_format.upper(), other_ep._replace_map())
 
             if season_ep_match:
@@ -1621,10 +1623,13 @@ def _format_pattern(self, pattern=None, multi=None):
             # fill out the template for this piece and then insert this piece into the actual pattern
             cur_name_group_result = re.sub('(?i)(?x)'+regex_used, regex_replacement, cur_name_group)
             #cur_name_group_result = cur_name_group.replace(ep_format, ep_string)
-            logger.log(u"found "+ep_format+" as the ep pattern using "+regex_used+" and replaced it with "+regex_replacement+" to result in "+cur_name_group_result+" from "+cur_name_group, logger.DEBUG)
+            #logger.log(u"found "+ep_format+" as the ep pattern using "+regex_used+" and replaced it with "+regex_replacement+" to result in "+cur_name_group_result+" from "+cur_name_group, logger.DEBUG)
             result_name = result_name.replace(cur_name_group, cur_name_group_result)
 
         result_name = self._format_string(result_name, replace_map)
+
+        logger.log(u"formatting pattern: "+pattern+" -> "+result_name, logger.DEBUG)
+        
         
         return result_name
 
diff --git a/sickbeard/tvrage.py b/sickbeard/tvrage.py
index 12b0a2dd18..e10921c10f 100644
--- a/sickbeard/tvrage.py
+++ b/sickbeard/tvrage.py
@@ -114,7 +114,7 @@ def confirmShow(self, force=False):
                     ep = t[self.show.tvdbid][curSeason][1]
 
                     # make sure we have a date to compare with
-                    if ep["firstaired"] == "" or ep["firstaired"] == None:
+                    if ep["firstaired"] == "" or ep["firstaired"] == None or ep["firstaired"] == "0000-00-00":
                         continue
 
                     # get a datetime object
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index f7df0a474f..709b36b62e 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -374,7 +374,7 @@ def update(self):
         if not output:
             return self._git_error()
 
-        pull_regex = '(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(\-\)'
+        pull_regex = '(\d+) .+,.+(\d+).+\(\+\),.+(\d+) .+\(\-\)'
 
         (files, insertions, deletions) = (None, None, None)
 
diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py
index aadfad8b64..99ff9c6e60 100644
--- a/sickbeard/webapi.py
+++ b/sickbeard/webapi.py
@@ -1508,6 +1508,10 @@ def run(self):
                 logger.log(u"API :: Unable to find show with id " + str(self.tvdbid), logger.WARNING)
                 return _responds(RESULT_SUCCESS, {"results": [], "langid": lang_id})
 
+            if not myShow.data['seriesname']:
+                logger.log(u"API :: Found show with tvdbid " + str(self.tvdbid) + ", however it contained no show name", logger.DEBUG)
+                return _responds(RESULT_FAILURE, msg="Show contains no name, invalid result")
+
             showOut = [{"tvdbid": self.tvdbid,
                        "name": unicode(myShow.data['seriesname']),
                        "first_aired": myShow.data['firstaired']}]
@@ -1698,6 +1702,8 @@ def run(self):
         tvdbResult = CMD_SickBeardSearchTVDB([], {"tvdbid": self.tvdbid}).run()
 
         if tvdbResult['result'] == result_type_map[RESULT_SUCCESS]:
+            if not tvdbResult['data']['results']:
+                return _responds(RESULT_FAILURE, msg="Empty results returned, check tvdbid and try again")
             if len(tvdbResult['data']['results']) == 1 and 'name' in tvdbResult['data']['results'][0]:
                 tvdbName = tvdbResult['data']['results'][0]['name']
 
@@ -1826,6 +1832,8 @@ def run(self):
         tvdbResult = CMD_SickBeardSearchTVDB([], {"tvdbid": self.tvdbid}).run()
 
         if tvdbResult['result'] == result_type_map[RESULT_SUCCESS]:
+            if not tvdbResult['data']['results']:
+                return _responds(RESULT_FAILURE, msg="Empty results returned, check tvdbid and try again")
             if len(tvdbResult['data']['results']) == 1 and 'name' in tvdbResult['data']['results'][0]:
                 tvdbName = tvdbResult['data']['results'][0]['name']
 
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 356121d14a..20f0dfce8b 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -336,12 +336,12 @@ def backlogOverview(self):
             epCounts[Overview.GOOD] = 0
             epCounts[Overview.UNAIRED] = 0
 
-            sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? ORDER BY season*1000+episode DESC", [curShow.tvdbid])
+            sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? ORDER BY season DESC, episode DESC", [curShow.tvdbid])
 
             for curResult in sqlResults:
 
                 curEpCat = curShow.getOverview(int(curResult["status"]))
-                epCats[str(curResult["season"])+"x"+str(curResult["episode"])] = curEpCat
+                epCats[str(curResult["season"]) + "x" + str(curResult["episode"])] = curEpCat
                 epCounts[curEpCat] += 1
 
             showCounts[curShow.tvdbid] = epCounts
@@ -904,7 +904,7 @@ def savePostProcessing(self, naming_pattern=None, naming_multi_ep=None,
 
         if self.isNamingValid(naming_abd_pattern, None, True) != "invalid":
             sickbeard.NAMING_ABD_PATTERN = naming_abd_pattern
-        else:
+        elif naming_custom_abd:
             results.append("You tried saving an invalid air-by-date naming config, not saving your air-by-date settings")
 
         sickbeard.USE_BANNER = use_banner
@@ -1107,12 +1107,6 @@ def saveProviders(self, nzbmatrix_username=None, nzbmatrix_apikey=None,
         sickbeard.NZBSRUS_UID = nzbs_r_us_uid.strip()
         sickbeard.NZBSRUS_HASH = nzbs_r_us_hash.strip()
 
-        sickbeard.NZBMATRIX_USERNAME = nzbmatrix_username
-        sickbeard.NZBMATRIX_APIKEY = nzbmatrix_apikey.strip()
-
-        sickbeard.NEWZBIN_USERNAME = newzbin_username
-        sickbeard.NEWZBIN_PASSWORD = newzbin_password
-
         sickbeard.PROVIDER_ORDER = provider_list
 
         sickbeard.save_config()
@@ -1448,10 +1442,10 @@ def index(self):
     notifications = ConfigNotifications()
 
 def haveXBMC():
-    return sickbeard.XBMC_HOST
+    return sickbeard.USE_XBMC and sickbeard.XBMC_UPDATE_LIBRARY
 
 def havePLEX():
-    return sickbeard.PLEX_SERVER_HOST
+    return sickbeard.USE_PLEX and sickbeard.PLEX_UPDATE_LIBRARY
 
 def HomeMenu():
     return [
@@ -2056,21 +2050,31 @@ def testTwitter(self):
     def testXBMC(self, host=None, username=None, password=None):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
 
-        result = notifiers.xbmc_notifier.test_notify(urllib.unquote_plus(host), username, password)
-        if len(result.split(":")) > 2 and 'OK' in result.split(":")[2]:
-            return "Test notice sent successfully to "+urllib.unquote_plus(host)
-        else:
-            return "Test notice failed to "+urllib.unquote_plus(host)
+        finalResult = ''
+        for curHost in [x.strip() for x in host.split(",")]:
+            curResult = notifiers.xbmc_notifier.test_notify(urllib.unquote_plus(curHost), username, password)
+            if len(curResult.split(":")) > 2 and 'OK' in curResult.split(":")[2]:
+                finalResult += "Test XBMC notice sent successfully to " + urllib.unquote_plus(curHost)
+            else:
+                finalResult += "Test XBMC notice failed to " + urllib.unquote_plus(curHost)
+            finalResult += "<br />\n"
+
+        return finalResult
 
     @cherrypy.expose
     def testPLEX(self, host=None, username=None, password=None):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
 
-        result = notifiers.plex_notifier.test_notify(urllib.unquote_plus(host), username, password)
-        if result:
-            return "Test notice sent successfully to "+urllib.unquote_plus(host)
-        else:
-            return "Test notice failed to "+urllib.unquote_plus(host)
+        finalResult = ''
+        for curHost in [x.strip() for x in host.split(",")]:
+            curResult = notifiers.plex_notifier.test_notify(urllib.unquote_plus(curHost), username, password)
+            if len(curResult.split(":")) > 2 and 'OK' in curResult.split(":")[2]:
+                finalResult += "Test Plex notice sent successfully to " + urllib.unquote_plus(curHost)
+            else:
+                finalResult += "Test Plex notice failed to " + urllib.unquote_plus(curHost)
+            finalResult += "<br />\n"
+
+        return finalResult
 
     @cherrypy.expose
     def testLibnotify(self):
@@ -2443,27 +2447,23 @@ def updateShow(self, show=None, force=0):
 
         redirect("/home/displayShow?show="+str(showObj.tvdbid))
 
-
     @cherrypy.expose
     def updateXBMC(self, showName=None):
-
-        for curHost in [x.strip() for x in sickbeard.XBMC_HOST.split(",")]:
-            if notifiers.xbmc_notifier._update_library(curHost, showName=showName):
-                ui.notifications.message("Command sent to XBMC host " + curHost + " to update library")
-            else:
-                ui.notifications.error("Unable to contact XBMC host " + curHost)
+        # TODO: configure that each host can have different options / username / pw
+        # only send update to first host in the list -- workaround for xbmc sql backend users
+        firstHost = sickbeard.XBMC_HOST.split(",")[0].strip()
+        if notifiers.xbmc_notifier.update_library(showName=showName):
+            ui.notifications.message("Library update command sent to XBMC host: " + firstHost)
+        else:
+            ui.notifications.error("Unable to contact XBMC host: " + firstHost)
         redirect('/home')
 
-
     @cherrypy.expose
     def updatePLEX(self):
-
-        if notifiers.plex_notifier._update_library():
-            ui.notifications.message("Command sent to Plex Media Server host " + sickbeard.PLEX_HOST + " to update library")
-            logger.log(u"Plex library update initiated for host " + sickbeard.PLEX_HOST, logger.DEBUG)
+        if notifiers.plex_notifier.update_library():
+            ui.notifications.message("Library update command sent to Plex Media Server host: " + sickbeard.PLEX_SERVER_HOST)
         else:
-            ui.notifications.error("Unable to contact Plex Media Server host " + sickbeard.PLEX_HOST)
-            logger.log(u"Plex library update failed for host " + sickbeard.PLEX_HOST, logger.ERROR)
+            ui.notifications.error("Unable to contact Plex Media Server host: " + sickbeard.PLEX_SERVER_HOST)
         redirect('/home')
 
     @cherrypy.expose
diff --git a/tests/name_parser_tests.py b/tests/name_parser_tests.py
index 77141e921d..02e1990e7a 100644
--- a/tests/name_parser_tests.py
+++ b/tests/name_parser_tests.py
@@ -139,6 +139,10 @@
                           ('Season 2\\Show Name - 03-04 - Ep Name.ext',
                            parser.ParseResult(None, 'Show Name', 2, [3,4], extra_info = 'Ep Name'),
                            ['no_season', 'season_only']),
+                           
+                          ('Season 02\\03-04-05 - Ep Name.ext',
+                           parser.ParseResult(None, None, 2, [3,4,5], extra_info = 'Ep Name'),
+                           ['no_season', 'season_only']),
                           ]
 
 unicode_test_cases = [
@@ -337,11 +341,11 @@ def test_combination_names(self):
         suite = unittest.TestLoader().loadTestsFromTestCase(BasicTests)
     unittest.TextTestRunner(verbosity=2).run(suite)
 
-    #suite = unittest.TestLoader().loadTestsFromTestCase(ComboTests)
-    #unittest.TextTestRunner(verbosity=2).run(suite)
+    suite = unittest.TestLoader().loadTestsFromTestCase(ComboTests)
+    unittest.TextTestRunner(verbosity=2).run(suite)
 
-    #suite = unittest.TestLoader().loadTestsFromTestCase(UnicodeTests)
-    #unittest.TextTestRunner(verbosity=2).run(suite)
+    suite = unittest.TestLoader().loadTestsFromTestCase(UnicodeTests)
+    unittest.TextTestRunner(verbosity=2).run(suite)
 
-    #suite = unittest.TestLoader().loadTestsFromTestCase(FailureCaseTests)
-    #unittest.TextTestRunner(verbosity=2).run(suite)
+    suite = unittest.TestLoader().loadTestsFromTestCase(FailureCaseTests)
+    unittest.TextTestRunner(verbosity=2).run(suite)