diff --git a/Gruntfile.js b/Gruntfile.js
index 6409ae289..8956b314f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -78,6 +78,7 @@ module.exports = function (grunt) {
                             '**/*.png',
                             '**/*.jpg',
                             '**/*.ico',
+                            '**/*.swf',
                             '**/FontAwesome/*.*',
                             '**/fonts/*.*'
                         ],
diff --git a/build.ps1 b/build.ps1
index c690b62bb..2656822ae 100644
--- a/build.ps1
+++ b/build.ps1
@@ -119,7 +119,7 @@ Function PackageOsx()
 
     if(Test-Path $outputFolderOsx)
     {
-        Remove-Item -Recurse -Force $outputFolderMono -ErrorAction Continue
+        Remove-Item -Recurse -Force $outputFolderOsx -ErrorAction Continue
     }
 
     Copy-Item $outputFolderMono $outputFolderOsx -recurse
diff --git a/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBroker.cs b/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBroker.cs
index 76c24161d..8995f96bc 100644
--- a/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBroker.cs
+++ b/src/Microsoft.AspNet.SignalR.Core/Messaging/MessageBroker.cs
@@ -295,6 +295,14 @@ namespace Microsoft.AspNet.SignalR.Messaging
 
                     Trace.TraceEvent(TraceEventType.Verbose, 0, "Dispoing the broker");
 
+                    //Check if OS is not Windows and exit
+                    var platform = (int)Environment.OSVersion.Platform;
+
+                    if ((platform == 4) || (platform == 6) || (platform == 128))
+                    {
+                        return;
+                    }
+
                     // Wait for all threads to stop working
                     WaitForDrain();
 
diff --git a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
index be784e000..f9d7a747e 100644
--- a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
+++ b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
@@ -275,6 +275,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
   </Target>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj b/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj
index c56d9ad68..0f98f2e7e 100644
--- a/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj
+++ b/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj
@@ -101,6 +101,7 @@
   </ItemGroup>
   <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Api/Authentication/EnableStatelessAuthInNancy.cs b/src/NzbDrone.Api/Authentication/EnableStatelessAuthInNancy.cs
index 34d59ad94..8996690bd 100644
--- a/src/NzbDrone.Api/Authentication/EnableStatelessAuthInNancy.cs
+++ b/src/NzbDrone.Api/Authentication/EnableStatelessAuthInNancy.cs
@@ -4,6 +4,7 @@ using Nancy;
 using Nancy.Bootstrapper;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Extensions.Pipelines;
+using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
 
@@ -12,12 +13,12 @@ namespace NzbDrone.Api.Authentication
     public class EnableStatelessAuthInNancy : IRegisterNancyPipeline
     {
         private readonly IAuthenticationService _authenticationService;
-        private readonly IConfigFileProvider _configFileProvider;
+        private static String API_KEY;
 
         public EnableStatelessAuthInNancy(IAuthenticationService authenticationService, IConfigFileProvider configFileProvider)
         {
             _authenticationService = authenticationService;
-            _configFileProvider = configFileProvider;
+            API_KEY = configFileProvider.ApiKey;
         }
 
         public void Register(IPipelines pipelines)
@@ -36,9 +37,9 @@ namespace NzbDrone.Api.Authentication
 
             var authorizationHeader = context.Request.Headers.Authorization;
             var apiKeyHeader = context.Request.Headers["X-Api-Key"].FirstOrDefault();
-            var apiKey = String.IsNullOrWhiteSpace(apiKeyHeader) ? authorizationHeader : apiKeyHeader;
-            
-            if (context.Request.IsApiRequest() && !ValidApiKey(apiKey) && !_authenticationService.IsAuthenticated(context))
+            var apiKey = apiKeyHeader.IsNullOrWhiteSpace() ? authorizationHeader : apiKeyHeader;
+
+            if (context.Request.IsApiRequest() && !ValidApiKey(apiKey) && !IsAuthenticated(context))
             {
                 response = new Response { StatusCode = HttpStatusCode.Unauthorized };
             }
@@ -48,10 +49,15 @@ namespace NzbDrone.Api.Authentication
 
         private bool ValidApiKey(string apiKey)
         {
-            if (String.IsNullOrWhiteSpace(apiKey)) return false;
-            if (!apiKey.Equals(_configFileProvider.ApiKey)) return false;
+            if (apiKey.IsNullOrWhiteSpace()) return false;
+            if (!apiKey.Equals(API_KEY)) return false;
 
             return true;
         }
+
+        private bool IsAuthenticated(NancyContext context)
+        {
+            return _authenticationService.Enabled && _authenticationService.IsAuthenticated(context);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs b/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs
index f3fa14e8b..c6525577c 100644
--- a/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs
+++ b/src/NzbDrone.Api/Config/DownloadClientConfigResource.cs
@@ -7,6 +7,7 @@ namespace NzbDrone.Api.Config
     {
         public String DownloadedEpisodesFolder { get; set; }
         public String DownloadClientWorkingFolders { get; set; }
+        public Int32 DownloadedEpisodesScanInterval { get; set; }
 
         public Boolean AutoRedownloadFailed { get; set; }
         public Boolean RemoveFailedDownloads { get; set; }
diff --git a/src/NzbDrone.Api/Config/HostConfigResource.cs b/src/NzbDrone.Api/Config/HostConfigResource.cs
index 8fc4151d9..3387ba421 100644
--- a/src/NzbDrone.Api/Config/HostConfigResource.cs
+++ b/src/NzbDrone.Api/Config/HostConfigResource.cs
@@ -14,6 +14,7 @@ namespace NzbDrone.Api.Config
         public String Password { get; set; }
         public String LogLevel { get; set; }
         public String Branch { get; set; }
+        public Boolean AutoUpdate { get; set; }
         public String ApiKey { get; set; }
         public Boolean Torrent { get; set; }
         public String SslCertHash { get; set; }
diff --git a/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs b/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
index 9ff4efc66..8958fe905 100644
--- a/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
+++ b/src/NzbDrone.Api/Config/MediaManagementConfigResource.cs
@@ -1,5 +1,6 @@
 using System;
 using NzbDrone.Api.REST;
+using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Api.Config
 {
@@ -9,6 +10,7 @@ namespace NzbDrone.Api.Config
         public String RecycleBin { get; set; }
         public Boolean AutoDownloadPropers { get; set; }
         public Boolean CreateEmptySeriesFolders { get; set; }
+        public FileDateType FileDate { get; set; }
 
         public Boolean SetPermissionsLinux { get; set; }
         public String FileChmod { get; set; }
diff --git a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
index 501e0b6fc..47759b5c5 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
@@ -1,8 +1,8 @@
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using Nancy;
 using NLog;
-using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
@@ -12,10 +12,12 @@ namespace NzbDrone.Api.Frontend.Mappers
     public class IndexHtmlMapper : StaticResourceMapperBase
     {
         private readonly IDiskProvider _diskProvider;
-        private readonly IConfigFileProvider _configFileProvider;
         private readonly string _indexPath;
         private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src|data-main)=\").*?(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        private static String API_KEY;
+        private static String URL_BASE;
+
         public IndexHtmlMapper(IAppFolderInfo appFolderInfo,
                                IDiskProvider diskProvider,
                                IConfigFileProvider configFileProvider,
@@ -23,8 +25,10 @@ namespace NzbDrone.Api.Frontend.Mappers
             : base(diskProvider, logger)
         {
             _diskProvider = diskProvider;
-            _configFileProvider = configFileProvider;
             _indexPath = Path.Combine(appFolderInfo.StartUpFolder, "UI", "index.html");
+
+            API_KEY = configFileProvider.ApiKey;
+            URL_BASE = configFileProvider.UrlBase;
         }
 
         protected override string Map(string resourceUrl)
@@ -54,12 +58,12 @@ namespace NzbDrone.Api.Frontend.Mappers
         {
             var text = _diskProvider.ReadAllText(_indexPath);
 
-            text = ReplaceRegex.Replace(text, match => _configFileProvider.UrlBase + match.Value);
+            text = ReplaceRegex.Replace(text, match => URL_BASE + match.Value);
 
             text = text.Replace(".css", ".css?v=" + BuildInfo.Version);
             text = text.Replace(".js", ".js?v=" + BuildInfo.Version);
-            text = text.Replace("API_ROOT", _configFileProvider.UrlBase + "/api");
-            text = text.Replace("API_KEY", _configFileProvider.ApiKey);
+            text = text.Replace("API_ROOT", URL_BASE + "/api");
+            text = text.Replace("API_KEY", API_KEY);
             text = text.Replace("APP_VERSION", BuildInfo.Version.ToString());
 
             return text;
diff --git a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs
index 5dbd3b734..a55fafc71 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs
@@ -26,7 +26,11 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/Content") || resourceUrl.EndsWith(".js") || resourceUrl.EndsWith(".css") || resourceUrl.EndsWith(".ico");
+            return resourceUrl.StartsWith("/Content") ||
+                   resourceUrl.EndsWith(".js") ||
+                   resourceUrl.EndsWith(".css") ||
+                   resourceUrl.EndsWith(".ico") ||
+                   resourceUrl.EndsWith(".swf");
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Api/Logs/LogFileModule.cs b/src/NzbDrone.Api/Logs/LogFileModule.cs
index b896e6020..5e63bb036 100644
--- a/src/NzbDrone.Api/Logs/LogFileModule.cs
+++ b/src/NzbDrone.Api/Logs/LogFileModule.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Api.Logs
                 {
                     Id = i + 1,
                     Filename = Path.GetFileName(file),
-                    LastWriteTime = _diskProvider.GetLastFileWrite(file)
+                    LastWriteTime = _diskProvider.FileGetLastWriteUtc(file)
                 });
             }
 
diff --git a/src/NzbDrone.Api/System/SystemModule.cs b/src/NzbDrone.Api/System/SystemModule.cs
index 5acd4d881..b56f1d14b 100644
--- a/src/NzbDrone.Api/System/SystemModule.cs
+++ b/src/NzbDrone.Api/System/SystemModule.cs
@@ -16,7 +16,11 @@ namespace NzbDrone.Api.System
         private readonly IConfigFileProvider _configFileProvider;
         private readonly IDatabase _database;
 
-        public SystemModule(IAppFolderInfo appFolderInfo, IRuntimeInfo runtimeInfo, IRouteCacheProvider routeCacheProvider, IConfigFileProvider configFileProvider, IDatabase database)
+        public SystemModule(IAppFolderInfo appFolderInfo,
+                            IRuntimeInfo runtimeInfo,
+                            IRouteCacheProvider routeCacheProvider,
+                            IConfigFileProvider configFileProvider,
+                            IDatabase database)
             : base("system")
         {
             _appFolderInfo = appFolderInfo;
@@ -41,8 +45,10 @@ namespace NzbDrone.Api.System
                     StartupPath = _appFolderInfo.StartUpFolder,
                     AppData = _appFolderInfo.GetAppDataPath(),
                     OsVersion = OsInfo.Version.ToString(),
+                    IsMonoRuntime = OsInfo.IsMono,
                     IsMono = OsInfo.IsMono,
-                    IsLinux = OsInfo.IsLinux,
+                    IsLinux = OsInfo.IsMono,
+                    IsOsx = OsInfo.IsOsx,
                     IsWindows = OsInfo.IsWindows,
                     Branch = _configFileProvider.Branch,
                     Authentication = _configFileProvider.AuthenticationEnabled,
@@ -50,10 +56,8 @@ namespace NzbDrone.Api.System
                     SqliteVersion = _database.Version,
                     UrlBase = _configFileProvider.UrlBase
                 }.AsResponse();
-
         }
 
-
         private Response GetRoutes()
         {
             return _routeCacheProvider.GetCache().Values.AsResponse();
diff --git a/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs b/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs
index 90ab30574..e4a953fce 100644
--- a/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs
+++ b/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs
@@ -144,7 +144,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests
         public void empty_folder_should_return_folder_modified_date()
         {
             var tempfolder = new DirectoryInfo(TempFolder);
-            Subject.GetLastFolderWrite(TempFolder).Should().Be(tempfolder.LastWriteTimeUtc);
+            Subject.FolderGetLastWrite(TempFolder).Should().Be(tempfolder.LastWriteTimeUtc);
         }
 
         [Test]
@@ -159,8 +159,8 @@ namespace NzbDrone.Common.Test.DiskProviderTests
             
             Subject.WriteAllText(testFile, "Test");
 
-            Subject.GetLastFolderWrite(SandboxFolder).Should().BeOnOrAfter(DateTime.UtcNow.AddMinutes(-1));
-            Subject.GetLastFolderWrite(SandboxFolder).Should().BeBefore(DateTime.UtcNow.AddMinutes(1));
+            Subject.FolderGetLastWrite(SandboxFolder).Should().BeOnOrAfter(DateTime.UtcNow.AddMinutes(-1));
+            Subject.FolderGetLastWrite(SandboxFolder).Should().BeBefore(DateTime.UtcNow.AddMinutes(1));
         }
 
         [Test]
@@ -208,7 +208,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests
         [Explicit]
         public void check_last_write()
         {
-            Console.WriteLine(Subject.GetLastFolderWrite(_binFolder.FullName));
+            Console.WriteLine(Subject.FolderGetLastWrite(_binFolder.FullName));
             Console.WriteLine(_binFolder.LastWriteTimeUtc);
         }
 
diff --git a/src/NzbDrone.Common.Test/DiskProviderTests/FreeSpaceFixtureBase.cs b/src/NzbDrone.Common.Test/DiskProviderTests/FreeSpaceFixtureBase.cs
index 4917c4457..f63942a11 100644
--- a/src/NzbDrone.Common.Test/DiskProviderTests/FreeSpaceFixtureBase.cs
+++ b/src/NzbDrone.Common.Test/DiskProviderTests/FreeSpaceFixtureBase.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests
         [Test]
         public void should_be_able_to_check_space_on_ramdrive()
         {
-            LinuxOnly();
+            MonoOnly();
             Subject.GetAvailableSpace("/run/").Should().NotBe(0);
         }
 
diff --git a/src/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
index 04562a119..3388df9ad 100644
--- a/src/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Common.Test.EnsureTest
         [TestCase(@"/var/user/file with, comma.mkv")]
         public void EnsureLinuxPath(string path)
         {
-            LinuxOnly();
+            MonoOnly();
             Ensure.That(path, () => path).IsValidPath();
         }
     }
diff --git a/src/NzbDrone.Common.Test/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
index fbc2fb6b6..8c75708e2 100644
--- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -50,7 +50,7 @@ namespace NzbDrone.Common.Test
         [TestCase(@"//CAPITAL//lower// ", @"/CAPITAL/lower")]
         public void Clean_Path_Linux(string dirty, string clean)
         {
-            LinuxOnly();
+            MonoOnly();
 
             var result = dirty.CleanFilePath();
             result.Should().Be(clean);
@@ -139,7 +139,7 @@ namespace NzbDrone.Common.Test
         [Test]
         public void get_actual_casing_should_return_original_value_in_linux()
         {
-            LinuxOnly();
+            MonoOnly();
             var path = Directory.GetCurrentDirectory();
             path.GetActualCasing().Should().Be(path);
             path.GetActualCasing().Should().Be(path);
diff --git a/src/NzbDrone.Common/ArchiveProvider.cs b/src/NzbDrone.Common/ArchiveProvider.cs
index 629d3c6bb..5d7d644d5 100644
--- a/src/NzbDrone.Common/ArchiveProvider.cs
+++ b/src/NzbDrone.Common/ArchiveProvider.cs
@@ -1,8 +1,11 @@
 using System;
 using System.IO;
 using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Tar;
 using ICSharpCode.SharpZipLib.Zip;
 using NLog;
+using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Common
 {
@@ -22,8 +25,23 @@ namespace NzbDrone.Common
 
         public void Extract(string compressedFile, string destination)
         {
-            _logger.Trace("Extracting archive [{0}] to [{1}]", compressedFile, destination);
+            _logger.Debug("Extracting archive [{0}] to [{1}]", compressedFile, destination);
 
+            if (OsInfo.IsWindows)
+            {
+                ExtractZip(compressedFile, destination);
+            }
+
+            else
+            {
+                ExtractTgz(compressedFile, destination);
+            }
+
+            _logger.Debug("Extraction complete.");
+        }
+
+        private void ExtractZip(string compressedFile, string destination)
+        {
             using (var fileStream = File.OpenRead(compressedFile))
             {
                 var zipFile = new ZipFile(fileStream);
@@ -64,8 +82,19 @@ namespace NzbDrone.Common
                     }
                 }
             }
+        }
 
-            _logger.Trace("Extraction complete.");
+        private void ExtractTgz(string compressedFile, string destination)
+        {
+            Stream inStream = File.OpenRead(compressedFile);
+            Stream gzipStream = new GZipInputStream(inStream);
+
+            TarArchive tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
+            tarArchive.ExtractContents(destination);
+            tarArchive.Close();
+
+            gzipStream.Close();
+            inStream.Close();
         }
 
         private void OnZipError(TestStatus status, string message)
diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
index d4a21b3c4..bc15fc84f 100644
--- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs
+++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Common.Disk
             return false;
         }
 
-        public DateTime GetLastFolderWrite(string path)
+        public DateTime FolderGetLastWrite(string path)
         {
             Ensure.That(path, () => path).IsValidPath();
 
@@ -76,7 +76,21 @@ namespace NzbDrone.Common.Disk
                             .Max(c => c.LastWriteTimeUtc);
         }
 
-        public DateTime GetLastFileWrite(string path)
+        public DateTime FileGetLastWrite(string path)
+        {
+            PathEnsureFileExists(path);
+
+            return new FileInfo(path).LastWriteTime;
+        }
+
+        public DateTime FileGetLastWriteUtc(string path)
+        {
+            PathEnsureFileExists(path);
+
+            return new FileInfo(path).LastWriteTimeUtc;
+        }
+
+        private void PathEnsureFileExists(string path)
         {
             Ensure.That(path, () => path).IsValidPath();
 
@@ -84,8 +98,6 @@ namespace NzbDrone.Common.Disk
             {
                 throw new FileNotFoundException("File doesn't exist: " + path);
             }
-
-            return new FileInfo(path).LastWriteTimeUtc;
         }
 
         public void EnsureFolder(string path)
@@ -189,7 +201,7 @@ namespace NzbDrone.Common.Disk
             Ensure.That(source, () => source).IsValidPath();
             Ensure.That(target, () => target).IsValidPath();
 
-            Logger.Trace("{0} {1} -> {2}", transferAction, source, target);
+            Logger.Debug("{0} {1} -> {2}", transferAction, source, target);
 
             var sourceFolder = new DirectoryInfo(source);
             var targetFolder = new DirectoryInfo(target);
@@ -208,7 +220,7 @@ namespace NzbDrone.Common.Disk
             {
                 var destFile = Path.Combine(target, sourceFile.Name);
 
-                Logger.Trace("{0} {1} -> {2}", transferAction, sourceFile, destFile);
+                Logger.Debug("{0} {1} -> {2}", transferAction, sourceFile, destFile);
 
                 switch (transferAction)
                 {
@@ -305,6 +317,26 @@ namespace NzbDrone.Common.Disk
             Directory.SetLastWriteTimeUtc(path, dateTime);
         }
 
+        public void FileSetLastWriteTime(string path, DateTime dateTime)
+        {
+            Ensure.That(path, () => path).IsValidPath();
+
+            File.SetLastWriteTime(path, dateTime);
+        }
+        public void FileSetLastAccessTime(string path, DateTime dateTime)
+        {
+            Ensure.That(path, () => path).IsValidPath();
+
+            File.SetLastAccessTimeUtc(path, dateTime);
+        }
+
+        public void FileSetLastAccessTimeUtc(string path, DateTime dateTime)
+        {
+            Ensure.That(path, () => path).IsValidPath();
+
+            File.SetLastAccessTimeUtc(path, dateTime);
+        }
+
         public bool IsFileLocked(string file)
         {
             try
diff --git a/src/NzbDrone.Common/Disk/IDiskProvider.cs b/src/NzbDrone.Common/Disk/IDiskProvider.cs
index 5eac1610d..896f393bb 100644
--- a/src/NzbDrone.Common/Disk/IDiskProvider.cs
+++ b/src/NzbDrone.Common/Disk/IDiskProvider.cs
@@ -12,8 +12,9 @@ namespace NzbDrone.Common.Disk
         void SetPermissions(string path, string mask, string user, string group);
         long? GetTotalSize(string path);
 
-        DateTime GetLastFolderWrite(string path);
-        DateTime GetLastFileWrite(string path);
+        DateTime FolderGetLastWrite(string path);
+        DateTime FileGetLastWrite(string path);
+        DateTime FileGetLastWriteUtc(string path);
         void EnsureFolder(string path);
         bool FolderExists(string path);
         bool FileExists(string path);
@@ -33,6 +34,8 @@ namespace NzbDrone.Common.Disk
         void WriteAllText(string filename, string contents);
         void FileSetLastWriteTimeUtc(string path, DateTime dateTime);
         void FolderSetLastWriteTimeUtc(string path, DateTime dateTime);
+        void FileSetLastWriteTime(string path, DateTime dateTime);
+        void FileSetLastAccessTime(string path, DateTime dateTime);
         bool IsFileLocked(string path);
         string GetPathRoot(string path);
         string GetParentFolder(string path);
diff --git a/src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs b/src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
index ede83ca40..d8bade8cf 100644
--- a/src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
+++ b/src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
@@ -100,7 +100,7 @@ namespace NzbDrone.Common.EnsureThat
 
             if (param.Value.IsPathValid()) return param;
 
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 throw ExceptionFactory.CreateForParamValidation(param.Name, string.Format("value [{0}]  is not a valid *nix path. paths must start with /", param.Value));
             }
diff --git a/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs b/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
index c49d4864b..d45f4269f 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Common.EnvironmentInfo
         {
             _diskProvider.EnsureFolder(_appFolderInfo.AppDataFolder);
 
-            if (!OsInfo.IsLinux)
+            if (!OsInfo.IsMono)
             {
                 SetPermissions();
             }
diff --git a/src/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
index 3a5bcd019..da1e7cfaa 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         public AppFolderInfo(IStartupContext startupContext)
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 DATA_SPECIAL_FOLDER = Environment.SpecialFolder.ApplicationData;
             }
diff --git a/src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs
index 3b769bfea..16894f00c 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
@@ -7,34 +8,80 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         static OsInfo()
         {
-            Version = Environment.OSVersion.Version;
-            IsMono = Type.GetType("Mono.Runtime") != null;
+            var platform = (int)Environment.OSVersion.Platform;
 
-            int platform = (int)Environment.OSVersion.Platform;
-            IsLinux = (platform == 4) || (platform == 6) || (platform == 128);
-            
+            Version = Environment.OSVersion.Version;
+
+            IsMonoRuntime = Type.GetType("Mono.Runtime") != null;           
+            IsMono = (platform == 4) || (platform == 6) || (platform == 128);
+            IsOsx = IsRunningOnMac();
+            IsLinux = IsMono && !IsOsx;
+            IsWindows = !IsMono;
+
+            FirstDayOfWeek = DateTime.Today.GetFirstDayOfWeek().DayOfWeek;
+
+            if (!IsMono)
+            {
+                Os = Os.Windows;
+            }
+
+            else
+            {
+                Os = IsOsx ? Os.Osx : Os.Linux;
+            }
         }
 
         public static Version Version { get; private set; }
-
+        public static bool IsMonoRuntime { get; private set; }
         public static bool IsMono { get; private set; }
-
         public static bool IsLinux { get; private set; }
+        public static bool IsOsx { get; private set; }
+        public static bool IsWindows { get; private set; }
+        public static Os Os { get; private set; }
+        public static DayOfWeek FirstDayOfWeek { get; private set; }
 
-        public static bool IsWindows
-        {
-            get
-            {
-                return !IsLinux;
-            }
-        }
+        //Borrowed from: https://github.com/jpobst/Pinta/blob/master/Pinta.Core/Managers/SystemManager.cs
+        //From Managed.Windows.Forms/XplatUI
+        [DllImport("libc")]
+        static extern int uname(IntPtr buf);
 
-        public static DayOfWeek FirstDayOfWeek
+        static bool IsRunningOnMac()
         {
-            get
+            var buf = IntPtr.Zero;
+
+            try
             {
-                return DateTime.Today.GetFirstDayOfWeek().DayOfWeek;
+                buf = Marshal.AllocHGlobal(8192);
+                // This is a hacktastic way of getting sysname from uname ()
+                if (uname(buf) == 0)
+                {
+                    var os = Marshal.PtrToStringAnsi(buf);
+
+                    if (os == "Darwin")
+                    {
+                        return true;
+                    }
+                }
             }
+            catch
+            {
+            }
+            finally
+            {
+                if (buf != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(buf);
+                }
+            }
+
+            return false;
         }
     }
+
+    public enum Os
+    {
+        Windows,
+        Linux,
+        Osx
+    }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
index 82369c35b..679fe2f1c 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
@@ -16,6 +16,7 @@ namespace NzbDrone.Common.EnvironmentInfo
         bool IsWindowsService { get; }
         bool IsConsole { get; }
         bool IsRunning { get; set; }
+        bool RestartPending { get; set; }
         string ExecutingApplication { get; }
     }
 
@@ -78,11 +79,12 @@ namespace NzbDrone.Common.EnvironmentInfo
                 return (OsInfo.IsWindows &&
                         IsUserInteractive &&
                         ProcessName.Equals(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase)) ||
-                        OsInfo.IsLinux;
+                        OsInfo.IsMono;
             } 
         }
 
         public bool IsRunning { get; set; }
+        public bool RestartPending { get; set; }
         public string ExecutingApplication { get; private set; }
 
         public static bool IsProduction { get; private set; }
diff --git a/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs b/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs
index 3331b39e4..dbf4e6d65 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs
@@ -18,6 +18,7 @@ namespace NzbDrone.Common.EnvironmentInfo
         internal const string UNINSTALL_SERVICE = "u";
         public const string HELP = "?";
         public const string TERMINATE = "terminateexisting";
+        public const string RESTART = "restart";
 
         public StartupContext(params string[] args)
         {
diff --git a/src/NzbDrone.Common/HttpProvider.cs b/src/NzbDrone.Common/HttpProvider.cs
index f60ee48fd..c64b081c6 100644
--- a/src/NzbDrone.Common/HttpProvider.cs
+++ b/src/NzbDrone.Common/HttpProvider.cs
@@ -102,14 +102,14 @@ namespace NzbDrone.Common
                     fileInfo.Directory.Create();
                 }
 
-                _logger.Trace("Downloading [{0}] to [{1}]", url, fileName);
+                _logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
 
                 var stopWatch = Stopwatch.StartNew();
                 var webClient = new WebClient();
                 webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgent);
                 webClient.DownloadFile(url, fileName);
                 stopWatch.Stop();
-                _logger.Trace("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
+                _logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
             }
             catch (WebException e)
             {
@@ -127,7 +127,7 @@ namespace NzbDrone.Common
         {
             address = String.Format("http://{0}/jsonrpc", address);
 
-            _logger.Trace("Posting command: {0}, to {1}", command, address);
+            _logger.Debug("Posting command: {0}, to {1}", command, address);
 
             byte[] byteArray = Encoding.ASCII.GetBytes(command);
 
diff --git a/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs b/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs
index f824a5ac4..b45b76a00 100644
--- a/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs
@@ -48,7 +48,7 @@ namespace NzbDrone.Common.Instrumentation
         {
             if (logEvent == null || logEvent.Exception == null) return;
 
-            InternalLogger.Trace("Sending Exception to api.exceptron.com. Process Name: {0}", Process.GetCurrentProcess().ProcessName);
+            InternalLogger.Debug("Sending Exception to api.exceptron.com. Process Name: {0}", Process.GetCurrentProcess().ProcessName);
 
             try
             {
diff --git a/src/NzbDrone.Common/Instrumentation/LogTargets.cs b/src/NzbDrone.Common/Instrumentation/LogTargets.cs
index f44ce456c..67e8f69d3 100644
--- a/src/NzbDrone.Common/Instrumentation/LogTargets.cs
+++ b/src/NzbDrone.Common/Instrumentation/LogTargets.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Common.Instrumentation
             }
             else
             {
-                if (inConsole && (OsInfo.IsLinux || new RuntimeInfo(null, new ServiceProvider(new ProcessProvider())).IsUserInteractive))
+                if (inConsole && (OsInfo.IsMono || new RuntimeInfo(null, new ServiceProvider(new ProcessProvider())).IsUserInteractive))
                 {
                     RegisterConsole();
                 }
diff --git a/src/NzbDrone.Common/PathEqualityComparer.cs b/src/NzbDrone.Common/PathEqualityComparer.cs
index ce55c50e8..88df4b480 100644
--- a/src/NzbDrone.Common/PathEqualityComparer.cs
+++ b/src/NzbDrone.Common/PathEqualityComparer.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Common
 
         public int GetHashCode(string obj)
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 return obj.CleanFilePath().GetHashCode();
             }
diff --git a/src/NzbDrone.Common/PathExtensions.cs b/src/NzbDrone.Common/PathExtensions.cs
index c08770fc8..16a9bddd1 100644
--- a/src/NzbDrone.Common/PathExtensions.cs
+++ b/src/NzbDrone.Common/PathExtensions.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Common
 
             var info = new FileInfo(path.Trim());
 
-            if (!OsInfo.IsLinux && info.FullName.StartsWith(@"\\")) //UNC
+            if (!OsInfo.IsMono && info.FullName.StartsWith(@"\\")) //UNC
             {
                 return info.FullName.TrimEnd('/', '\\', ' ');
             }
@@ -39,7 +39,7 @@ namespace NzbDrone.Common
 
         public static bool PathEquals(this string firstPath, string secondPath)
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 if (firstPath.Equals(secondPath)) return true;
                 return String.Equals(firstPath.CleanFilePath(), secondPath.CleanFilePath());
@@ -58,7 +58,7 @@ namespace NzbDrone.Common
                 return false;
             }
 
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 return path.StartsWith(Path.DirectorySeparatorChar.ToString());
             }
@@ -97,7 +97,7 @@ namespace NzbDrone.Common
 
         public static string GetActualCasing(this string path)
         {
-            if (OsInfo.IsLinux || path.StartsWith("\\"))
+            if (OsInfo.IsMono || path.StartsWith("\\"))
             {
                 return path;
             }
diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs
index d1c4774e5..f0ac02148 100644
--- a/src/NzbDrone.Common/Processes/ProcessProvider.cs
+++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs
@@ -60,7 +60,7 @@ namespace NzbDrone.Common.Processes
 
         public ProcessInfo GetProcessById(int id)
         {
-            Logger.Trace("Finding process with Id:{0}", id);
+            Logger.Debug("Finding process with Id:{0}", id);
 
             var processInfo = ConvertToProcessInfo(Process.GetProcesses().FirstOrDefault(p => p.Id == id));
 
@@ -70,7 +70,7 @@ namespace NzbDrone.Common.Processes
             }
             else
             {
-                Logger.Trace("Found process {0}", processInfo.ToString());
+                Logger.Debug("Found process {0}", processInfo.ToString());
             }
 
             return processInfo;
@@ -186,7 +186,7 @@ namespace NzbDrone.Common.Processes
 
         public void WaitForExit(Process process)
         {
-            Logger.Trace("Waiting for process {0} to exit.", process.ProcessName);
+            Logger.Debug("Waiting for process {0} to exit.", process.ProcessName);
 
             process.WaitForExit();
         }
@@ -268,7 +268,7 @@ namespace NzbDrone.Common.Processes
 
             if (process.HasExited)
             {
-                Logger.Trace("Process has already exited");
+                Logger.Debug("Process has already exited");
                 return;
             }
 
diff --git a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs
index bb91060ae..fc8bf395f 100644
--- a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs
@@ -253,5 +253,22 @@ namespace NzbDrone.Core.Test.Download
 
             VerifyNoFailedDownloads();
         }
+
+        [Test]
+        public void should_not_process_if_failed_due_to_lack_of_disk_space()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .Build()
+                                                  .ToList();
+
+            GivenGrabbedHistory(history);
+            GivenFailedDownloadClientHistory();
+
+            _failed.First().Message = "Unpacking failed, write error or disk is full?";
+
+            Subject.Execute(new CheckForFailedDownloadCommand());
+
+            VerifyNoFailedDownloads();
+        }
     }
 }
diff --git a/src/NzbDrone.Core.Test/Files/TestArchive.tar.gz b/src/NzbDrone.Core.Test/Files/TestArchive.tar.gz
new file mode 100644
index 000000000..b37bf2971
Binary files /dev/null and b/src/NzbDrone.Core.Test/Files/TestArchive.tar.gz differ
diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs
new file mode 100644
index 000000000..5f968a90b
--- /dev/null
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Processes;
+using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.HealthCheck.Checks
+{
+    [TestFixture]
+    public class MonoVersionCheckFixture : CoreTest<MonoVersionCheck>
+    {
+        [SetUp]
+        public void Setup()
+        {
+            MonoOnly();
+        }
+
+        private void GivenOutput(string version)
+        {
+            Mocker.GetMock<IProcessProvider>()
+                  .Setup(s => s.StartAndCapture("mono", "--version"))
+                  .Returns(new ProcessOutput
+                  {
+                      Standard = new List<string>
+                      {
+                          String.Format("Mono JIT compiler version {0} (Debian {0}-8)", version),
+                          "Copyright (C) 2002-2011 Novell, Inc, Xamarin, Inc and Contributors. www.mono-project.com"
+                      }
+                  });
+        }
+
+        [Test]
+        public void should_return_warning_when_mono_3_0()
+        {
+            GivenOutput("3.0.0.1");
+
+            Subject.Check().ShouldBeWarning();
+        }
+
+        [Test]
+        public void should_return_warning_when_mono_2_10_8()
+        {
+            GivenOutput("2.10.8.1");
+
+            Subject.Check().ShouldBeWarning();
+        }
+
+        [Test]
+        public void should_return_null_when_mono_3_2()
+        {
+            GivenOutput("3.2.0.1");
+
+            Subject.Check().Should().BeNull();
+        }
+
+        [Test]
+        public void should_return_null_when_mono_4_0()
+        {
+            GivenOutput("4.0.0.0");
+
+            Subject.Check().Should().BeNull();
+        }
+
+        [Test]
+        public void should_return_null_when_mono_3_2_7()
+        {
+            GivenOutput("3.2.7");
+
+            Subject.Check().Should().BeNull();
+        }
+
+        [Test]
+        public void should_return_null_when_mono_3_2_1()
+        {
+            GivenOutput("3.2.1");
+
+            Subject.Check().Should().BeNull();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
index bb49dbfd3..6d26f4836 100644
--- a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
+++ b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
@@ -4,7 +4,6 @@ using FluentAssertions;
 using NLog;
 using NUnit.Framework;
 using NzbDrone.Common.Instrumentation;
-using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Migration.Framework;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Instrumentation;
@@ -103,7 +102,7 @@ namespace NzbDrone.Core.Test.InstrumentationTests
         public void null_string_as_arg_should_not_fail()
         {
             var epFile = new EpisodeFile();
-            _logger.Trace("File {0} no longer exists on disk. removing from database.", epFile.Path);
+            _logger.Debug("File {0} no longer exists on disk. removing from database.", epFile.Path);
 
             epFile.Path.Should().BeNull();
         }
diff --git a/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs b/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
index f06a50f77..b12c94540 100644
--- a/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
                     new MediaCover.MediaCover {CoverType = MediaCoverTypes.Banner}
                 };
 
-            Mocker.GetMock<IDiskProvider>().Setup(c => c.GetLastFileWrite(It.IsAny<string>()))
+            Mocker.GetMock<IDiskProvider>().Setup(c => c.FileGetLastWriteUtc(It.IsAny<string>()))
                   .Returns(new DateTime(1234));
 
             Mocker.GetMock<IDiskProvider>().Setup(c => c.FileExists(It.IsAny<string>()))
diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecificationFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecificationFixture.cs
index ba39c485e..155420917 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecificationFixture.cs
@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         private void GivenLastWriteTimeUtc(DateTime time)
         {
             Mocker.GetMock<IDiskProvider>()
-                .Setup(s => s.GetLastFileWrite(It.IsAny<string>()))
+                .Setup(s => s.FileGetLastWriteUtc(It.IsAny<string>()))
                 .Returns(time);
         }
 
@@ -75,7 +75,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         [Test]
         public void should_return_false_if_unopacking_on_linux()
         {
-            LinuxOnly();
+            MonoOnly();
 
             GivenInWorkingFolder();
             GivenLastWriteTimeUtc(DateTime.UtcNow.AddDays(-5));
diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs
index 2135e773a..ea567a509 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs
@@ -108,7 +108,7 @@ namespace NzbDrone.Core.Test.MediaFiles
         [Test]
         public void filter_should_return_none_existing_files_not_ignoring_case()
         {
-            LinuxOnly();
+            MonoOnly();
 
             var files = new List<string>()
             {
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index d2b866928..dda23aeb2 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -125,10 +125,11 @@
     <Compile Include="Framework\CoreTest.cs" />
     <Compile Include="Framework\DbTest.cs" />
     <Compile Include="Framework\NBuilderExtensions.cs" />
+    <Compile Include="HealthCheck\Checks\DownloadClientCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\UpdateCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\IndexerCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\DroneFactoryCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\DownloadClientCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\MonoVersionCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\HealthCheckFixtureExtentions.cs" />
     <Compile Include="HistoryTests\HistoryServiceFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedHistoryItemsFixture.cs" />
@@ -362,6 +363,9 @@
     <None Include="Files\SceneMappings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Files\TestArchive.tar.gz">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Files\TestArchive.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/NzbDrone.Core.Test/ParserTests/NormalizeTitleFixture.cs b/src/NzbDrone.Core.Test/ParserTests/NormalizeTitleFixture.cs
index 19c42dff4..c58170bc1 100644
--- a/src/NzbDrone.Core.Test/ParserTests/NormalizeTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/NormalizeTitleFixture.cs
@@ -15,8 +15,6 @@ namespace NzbDrone.Core.Test.ParserTests
     public class NormalizeTitleFixture : CoreTest
     {
         [TestCase("Conan", "conan")]
-        [TestCase("The Tonight Show With Jay Leno", "tonightshowwithjayleno")]
-        [TestCase("The.Daily.Show", "dailyshow")]
         [TestCase("Castle (2009)", "castle2009")]
         [TestCase("Parenthood.2010", "parenthood2010")]
         [TestCase("Law_and_Order_SVU", "lawordersvu")]
@@ -51,9 +49,6 @@ namespace NzbDrone.Core.Test.ParserTests
                                 "word.{0}.word",
                                 "word {0} word",
                                 "word-{0}-word",
-                                "{0}.word.word",
-                                "{0}-word-word",
-                                "{0} word word",
                                 "word.word.{0}",
                                 "word-word-{0}",
                                 "word-word {0}",
@@ -64,7 +59,6 @@ namespace NzbDrone.Core.Test.ParserTests
                 var dirty = String.Format(s, word);
                 dirty.CleanSeriesTitle().Should().Be("wordword");
             }
-
         }
 
         [TestCase("the")]
@@ -92,5 +86,36 @@ namespace NzbDrone.Core.Test.ParserTests
             }
 
         }
+
+        [TestCase("The Office", "theoffice")]
+        [TestCase("The Tonight Show With Jay Leno", "thetonightshowwithjayleno")]
+        [TestCase("The.Daily.Show", "thedailyshow")]
+        public void should_not_remove_from_the_beginning_of_the_title(string parsedSeriesName, string seriesName)
+        {
+            var result = parsedSeriesName.CleanSeriesTitle();
+            result.Should().Be(seriesName);
+        }
+
+        [TestCase("the")]
+        [TestCase("and")]
+        [TestCase("or")]
+        [TestCase("a")]
+        [TestCase("an")]
+        [TestCase("of")]
+        public void should_not_clean_word_from_beginning_of_string(string word)
+        {
+            var dirtyFormat = new[]
+                            {
+                                "{0}.word.word",
+                                "{0}-word-word",
+                                "{0} word word"
+                            };
+
+            foreach (var s in dirtyFormat)
+            {
+                var dirty = String.Format(s, word);
+                dirty.CleanSeriesTitle().Should().Be(word + "wordword");
+            }
+        }
     }
 }
diff --git a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
index 359699d13..bfcbcb926 100644
--- a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs
@@ -23,46 +23,13 @@ namespace NzbDrone.Core.Test.ParserTests
          * Superman.-.The.Man.of.Steel.1994-05.33.hybrid.DreamGirl-Novus-HD
          */
 
-        [TestCase("[SubDESU]_High_School_DxD_07_(1280x720_x264-AAC)_[6B7FD717]", "High School DxD", 7, 0, 0)]
-        [TestCase("[Chihiro]_Working!!_-_06_[848x480_H.264_AAC][859EEAFA]", "Working!!", 6, 0, 0)]
-        [TestCase("[Commie]_Senki_Zesshou_Symphogear_-_11_[65F220B4]", "Senki_Zesshou_Symphogear", 11, 0, 0)]
-        [TestCase("[Underwater]_Rinne_no_Lagrange_-_12_(720p)_[5C7BC4F9]", "Rinne_no_Lagrange", 12, 0, 0)]
-        [TestCase("[Commie]_Rinne_no_Lagrange_-_15_[E76552EA]", "Rinne_no_Lagrange", 15, 0, 0)]
-        [TestCase("[HorribleSubs]_Hunter_X_Hunter_-_33_[720p]", "Hunter_X_Hunter", 33, 0, 0)]
-        [TestCase("[HorribleSubs]_Fairy_Tail_-_145_[720p]", "Fairy_Tail", 145, 0, 0)]
-        [TestCase("[HorribleSubs] Tonari no Kaibutsu-kun - 13 [1080p].mkv", "Tonari no Kaibutsu-kun", 13, 0, 0)]
-        [TestCase("[Doremi].Yes.Pretty.Cure.5.Go.Go!.31.[1280x720].[C65D4B1F].mkv", "Yes.Pretty.Cure.5.Go.Go!", 31, 0, 0)]
-        [TestCase("[K-F] One Piece 214", "One Piece", 214, 0, 0)]
-        [TestCase("[K-F] One Piece S10E14 214", "One Piece", 214, 10, 14)]
-        [TestCase("[K-F] One Piece 10x14 214", "One Piece", 214, 10, 14)]
-        [TestCase("[K-F] One Piece 214 10x14", "One Piece", 214, 10, 14)]
-//        [TestCase("One Piece S10E14 214", "One Piece", 214, 10, 14)]
-//        [TestCase("One Piece 10x14 214", "One Piece", 214, 10, 14)]
-//        [TestCase("One Piece 214 10x14", "One Piece", 214, 10, 14)]
-//        [TestCase("214 One Piece 10x14", "One Piece", 214, 10, 14)]
-        [TestCase("Bleach - 031 - The Resolution to Kill [Lunar].avi", "Bleach", 31, 0, 0)]
-        [TestCase("Bleach - 031 - The Resolution to Kill [Lunar]", "Bleach", 31, 0, 0)]
-        [TestCase("[ACX]Hack Sign 01 Role Play [Kosaka] [9C57891E].mkv", "Hack Sign", 1, 0, 0)]
-        [TestCase("[SFW-sage] Bakuman S3 - 12 [720p][D07C91FC]", "Bakuman S3", 12, 0, 0)]
-        [TestCase("ducktales_e66_time_is_money_part_one_marking_time", "DuckTales", 66, 0, 0)]
-        public void parse_absolute_numbers(string postTitle, string title, int absoluteEpisodeNumber, int seasonNumber, int episodeNumber)
-        {
-            var result = Parser.Parser.ParseTitle(postTitle);
-            result.Should().NotBeNull();
-            result.AbsoluteEpisodeNumbers.First().Should().Be(absoluteEpisodeNumber);
-            result.SeasonNumber.Should().Be(seasonNumber);
-            result.EpisodeNumbers.FirstOrDefault().Should().Be(episodeNumber);
-            result.SeriesTitle.Should().Be(title.CleanSeriesTitle());
-            result.FullSeason.Should().BeFalse();
-        }
-
         [TestCase("Chuck - 4x05 - Title", "Chuck")]
         [TestCase("Law & Order - 4x05 - Title", "laworder")]
         [TestCase("Bad Format", "badformat")]
         [TestCase("Mad Men - Season 1 [Bluray720p]", "madmen")]
         [TestCase("Mad Men - Season 1 [Bluray1080p]", "madmen")]
-        [TestCase("The Daily Show With Jon Stewart -", "dailyshowwithjonstewart")]
-        [TestCase("The Venture Bros. (2004)", "venturebros2004")]
+        [TestCase("The Daily Show With Jon Stewart -", "thedailyshowwithjonstewart")]
+        [TestCase("The Venture Bros. (2004)", "theventurebros2004")]
         [TestCase("Castle (2011)", "castle2011")]
         [TestCase("Adventure Time S02 720p HDTV x264 CRON", "adventuretime")]
         [TestCase("Hawaii Five 0", "hawaiifive0")]
diff --git a/src/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ArchiveProviderFixture.cs b/src/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ArchiveProviderFixture.cs
index 9cf514eb1..a9f3e2f0d 100644
--- a/src/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ArchiveProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ArchiveProviderFixture.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using System.IO;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests
@@ -13,7 +14,9 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests
         public void Should_extract_to_correct_folder()
         {
             var destination = Path.Combine(TempFolder, "destination");
-            Subject.Extract(GetTestFilePath("TestArchive.zip"), destination);
+            var testArchive = OsInfo.IsWindows ? "TestArchive.zip" : "TestArchive.tar.gz";
+
+            Subject.Extract(GetTestFilePath(testArchive), destination);
 
             var destinationFolder = new DirectoryInfo(destination);
 
diff --git a/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs b/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
index ba42b585a..9436770ae 100644
--- a/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
+++ b/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
@@ -18,19 +18,19 @@ namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
 
         private void WithExpired()
         {
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetLastFolderWrite(It.IsAny<String>()))
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.FolderGetLastWrite(It.IsAny<String>()))
                                             .Returns(DateTime.UtcNow.AddDays(-10));
 
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetLastFileWrite(It.IsAny<String>()))
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.FileGetLastWriteUtc(It.IsAny<String>()))
                                             .Returns(DateTime.UtcNow.AddDays(-10));
         }
 
         private void WithNonExpired()
         {
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetLastFolderWrite(It.IsAny<String>()))
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.FolderGetLastWrite(It.IsAny<String>()))
                                             .Returns(DateTime.UtcNow.AddDays(-3));
 
-            Mocker.GetMock<IDiskProvider>().Setup(s => s.GetLastFileWrite(It.IsAny<String>()))
+            Mocker.GetMock<IDiskProvider>().Setup(s => s.FileGetLastWriteUtc(It.IsAny<String>()))
                                             .Returns(DateTime.UtcNow.AddDays(-3));
         }
 
diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
index 810dc8661..357463bdf 100644
--- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
@@ -21,17 +21,30 @@ namespace NzbDrone.Core.Test.UpdateTests
     {
         private string _sandboxFolder;
 
-        private readonly UpdatePackage _updatePackage = new UpdatePackage
-        {
-            FileName = "NzbDrone.develop.2.0.0.zip",
-            Url = "http://update.nzbdrone.com/v2/develop/NzbDrone.develop.zip",
-            Version = new Version("2.0.0")
-        };
+        private UpdatePackage _updatePackage;
 
         [SetUp]
         public void Setup()
         {
-            WindowsOnly();
+            if (OsInfo.IsLinux)
+            {
+                _updatePackage = new UpdatePackage
+                {
+                    FileName = "NzbDrone.develop.2.0.0.0.tar.gz",
+                    Url = "http://update.nzbdrone.com/v2/develop/mono/NzbDrone.develop.tar.gz",
+                    Version = new Version("2.0.0.0")
+                };
+            }
+
+            else
+            {
+                _updatePackage = new UpdatePackage
+                {
+                    FileName = "NzbDrone.develop.2.0.0.0.zip",
+                    Url = "http://update.nzbdrone.com/v2/develop/windows/NzbDrone.develop.zip",
+                    Version = new Version("2.0.0.0")
+                };
+            }
 
             Mocker.GetMock<IAppFolderInfo>().SetupGet(c => c.TempFolder).Returns(TempFolder);
             Mocker.GetMock<ICheckUpdateService>().Setup(c => c.AvailableUpdate()).Returns(_updatePackage);
@@ -42,7 +55,6 @@ namespace NzbDrone.Core.Test.UpdateTests
         }
 
 
-
         [Test]
         public void should_delete_sandbox_before_update_if_folder_exists()
         {
@@ -136,7 +148,7 @@ namespace NzbDrone.Core.Test.UpdateTests
             updateSubFolder.Refresh();
 
             updateSubFolder.Exists.Should().BeTrue();
-            updateSubFolder.GetDirectories("nzbdrone").Should().HaveCount(1);
+            updateSubFolder.GetDirectories("NzbDrone").Should().HaveCount(1);
             updateSubFolder.GetDirectories().Should().HaveCount(1);
             updateSubFolder.GetFiles().Should().NotBeEmpty();
         }
diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
index f82da6eb1..ed6d9fc36 100644
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -9,12 +9,14 @@ using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration.Events;
 using NzbDrone.Core.Lifecycle;
+using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 
 
 namespace NzbDrone.Core.Configuration
 {
-    public interface IConfigFileProvider : IHandleAsync<ApplicationStartedEvent>
+    public interface IConfigFileProvider : IHandleAsync<ApplicationStartedEvent>,
+                                           IExecute<ResetApiKeyCommand>
     {
         Dictionary<string, object> GetConfigDictionary();
         void SaveConfigDictionary(Dictionary<string, object> configValues);
@@ -28,6 +30,7 @@ namespace NzbDrone.Core.Configuration
         string Password { get; }
         string LogLevel { get; }
         string Branch { get; }
+        bool AutoUpdate { get; }
         string ApiKey { get; }
         bool Torrent { get; }
         string SslCertHash { get; }
@@ -75,6 +78,11 @@ namespace NzbDrone.Core.Configuration
 
             foreach (var configValue in configValues)
             {
+                if (configValue.Key.Equals("ApiKey", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    continue;
+                }
+
                 object currentValue;
                 allWithDefaults.TryGetValue(configValue.Key, out currentValue);
                 if (currentValue == null) continue;
@@ -114,7 +122,7 @@ namespace NzbDrone.Core.Configuration
         {
             get
             {
-                return GetValue("ApiKey", Guid.NewGuid().ToString().Replace("-", ""));
+                return GetValue("ApiKey", GenerateApiKey());
             }
         }
 
@@ -133,6 +141,11 @@ namespace NzbDrone.Core.Configuration
             get { return GetValue("Branch", "master").ToLowerInvariant(); }
         }
 
+        public bool AutoUpdate
+        {
+            get { return GetValueBoolean("AutoUpdate", false, persist: false); }
+        }
+
         public string Username
         {
             get { return GetValue("Username", ""); }
@@ -290,9 +303,19 @@ namespace NzbDrone.Core.Configuration
             }
         }
 
+        private string GenerateApiKey()
+        {
+            return Guid.NewGuid().ToString().Replace("-", "");
+        }
+
         public void HandleAsync(ApplicationStartedEvent message)
         {
             DeleteOldValues();
         }
+
+        public void Execute(ResetApiKeyCommand message)
+        {
+            SetValue("ApiKey", GenerateApiKey());
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs
index a0aa00bc8..9626b969b 100644
--- a/src/NzbDrone.Core/Configuration/ConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigService.cs
@@ -4,9 +4,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Core.Configuration.Events;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Download.Clients.Nzbget;
-using NzbDrone.Core.Download.Clients.Sabnzbd;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Messaging.Events;
 
 
@@ -141,18 +139,31 @@ namespace NzbDrone.Core.Configuration
 
         public Boolean CreateEmptySeriesFolders
         {
-            //TODO: only create if the parent folder exists (check first)
             get { return GetValueBoolean("CreateEmptySeriesFolders", false); }
 
             set { SetValue("CreateEmptySeriesFolders", value); }
         }
 
+        public FileDateType FileDate
+        {
+            get { return GetValueEnum("FileDate", FileDateType.None); }
+
+            set { SetValue("FileDate", value); }
+        }
+
         public String DownloadClientWorkingFolders
         {
             get { return GetValue("DownloadClientWorkingFolders", "_UNPACK_|_FAILED_"); }
             set { SetValue("DownloadClientWorkingFolders", value); }
         }
 
+        public Int32 DownloadedEpisodesScanInterval
+        {
+            get { return GetValueInt("DownloadedEpisodesScanInterval", 1); }
+
+            set { SetValue("DownloadedEpisodesScanInterval", value); }
+        }
+
         public Boolean SetPermissionsLinux
         {
             get { return GetValueBoolean("SetPermissionsLinux", false); }
@@ -243,7 +254,7 @@ namespace NzbDrone.Core.Configuration
         {
             key = key.ToLowerInvariant();
 
-            _logger.Trace("Writing Setting to file. Key:'{0}' Value:'{1}'", key, value);
+            _logger.Trace("Writing Setting to database. Key:'{0}' Value:'{1}'", key, value);
 
             var dbValue = _repository.Get(key);
 
diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs
index ca44cc046..9a513e75a 100644
--- a/src/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/IConfigService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Core.Configuration
 {
@@ -12,6 +13,7 @@ namespace NzbDrone.Core.Configuration
         //Download Client
         String DownloadedEpisodesFolder { get; set; }
         String DownloadClientWorkingFolders { get; set; }
+        Int32 DownloadedEpisodesScanInterval { get; set; }
 
         //Failed Download Handling (Download client)
         Boolean AutoRedownloadFailed { get; set; }
@@ -23,6 +25,7 @@ namespace NzbDrone.Core.Configuration
         String RecycleBin { get; set; }
         Boolean AutoDownloadPropers { get; set; }
         Boolean CreateEmptySeriesFolders { get; set; }
+        FileDateType FileDate { get; set; }
 
         //Permissions (Media Management)
         Boolean SetPermissionsLinux { get; set; }
diff --git a/src/NzbDrone.Core/Configuration/ResetApiKeyCommand.cs b/src/NzbDrone.Core/Configuration/ResetApiKeyCommand.cs
new file mode 100644
index 000000000..54ab97643
--- /dev/null
+++ b/src/NzbDrone.Core/Configuration/ResetApiKeyCommand.cs
@@ -0,0 +1,15 @@
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.Configuration
+{
+    public class ResetApiKeyCommand : Command
+    {
+        public override bool SendUpdatesToClient
+        {
+            get
+            {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
index f3c381b7b..80b1f58e2 100644
--- a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
         public List<int> GetXemSeriesIds()
         {
-            _logger.Trace("Fetching Series IDs from");
+            _logger.Debug("Fetching Series IDs from");
 
             var restClient = new RestClient(XEM_BASE_URL);
 
@@ -52,9 +52,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
         public List<XemSceneTvdbMapping> GetSceneTvdbMappings(int id)
         {
-            _logger.Trace("Fetching Mappings for: {0}", id);
-            var url = String.Format("{0}all?id={1}&origin=tvdb", XEM_BASE_URL, id);
-
+            _logger.Debug("Fetching Mappings for: {0}", id);
 
             var restClient = new RestClient(XEM_BASE_URL);
 
diff --git a/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs b/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
index fc0146c7b..682129d77 100644
--- a/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
         private void PerformUpdate(Series series)
         {
-            _logger.Trace("Updating scene numbering mapping for: {0}", series);
+            _logger.Debug("Updating scene numbering mapping for: {0}", series);
 
             try
             {
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
                 if (!mappings.Any())
                 {
-                    _logger.Trace("Mappings for: {0} are empty, skipping", series);
+                    _logger.Debug("Mappings for: {0} are empty, skipping", series);
                     _cache.Remove(series.TvdbId.ToString());
                     return;
                 }
@@ -54,13 +54,13 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
                 foreach (var mapping in mappings)
                 {
-                    _logger.Trace("Setting scene numbering mappings for {0} S{1:00}E{2:00}", series, mapping.Tvdb.Season, mapping.Tvdb.Episode);
+                    _logger.Debug("Setting scene numbering mappings for {0} S{1:00}E{2:00}", series, mapping.Tvdb.Season, mapping.Tvdb.Episode);
 
                     var episode = episodes.SingleOrDefault(e => e.SeasonNumber == mapping.Tvdb.Season && e.EpisodeNumber == mapping.Tvdb.Episode);
 
                     if (episode == null)
                     {
-                        _logger.Trace("Information hasn't been added to TheTVDB yet, skipping.");
+                        _logger.Debug("Information hasn't been added to TheTVDB yet, skipping.");
                         continue;
                     }
 
@@ -105,7 +105,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
 
             if (!_cache.Find(message.Series.TvdbId.ToString()))
             {
-                _logger.Trace("Scene numbering is not available for {0} [{1}]", message.Series.Title, message.Series.TvdbId);
+                _logger.Debug("Scene numbering is not available for {0} [{1}]", message.Series.Title, message.Series.TvdbId);
                 return;
             }
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/046_fix_nzb_su_url.cs b/src/NzbDrone.Core/Datastore/Migration/046_fix_nzb_su_url.cs
new file mode 100644
index 000000000..6d5496c0a
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/046_fix_nzb_su_url.cs
@@ -0,0 +1,16 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(46)]
+    public class fix_nzb_su_url : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.Sql("UPDATE Indexers SET Settings = replace(Settings, '//nzb.su', '//api.nzb.su')" +
+                        "WHERE Implementation = 'Newznab'" +
+                        "AND Settings LIKE '%//nzb.su%'");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs
index cab90b90c..1d924ab08 100644
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
 
         public void Sql(string sql)
         {
-            _logger.Trace(sql);
+            _logger.Debug(sql);
         }
 
         public void ElapsedTime(TimeSpan timeSpan)
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
index bae6f3d60..0963760ce 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Common.Serializer;
diff --git a/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs
index aae2a6d6b..a37f65ef3 100644
--- a/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.DecisionEngine
                 int compare = new QualityModelComparer(profile).Compare(newQuality, currentQuality);
                 if (compare <= 0)
                 {
-                    _logger.Trace("existing item has better or equal quality. skipping");
+                    _logger.Debug("existing item has better or equal quality. skipping");
                     return false;
                 }
 
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.DecisionEngine
                     return true;
                 }
 
-                _logger.Trace("Existing item meets cut-off. skipping.");
+                _logger.Debug("Existing item meets cut-off. skipping.");
                 return false;
             }
 
@@ -63,7 +63,7 @@ namespace NzbDrone.Core.DecisionEngine
 
             if (currentQuality.Quality == newQuality.Quality && compare > 0)
             {
-                _logger.Trace("New quality is a proper for existing quality");
+                _logger.Debug("New quality is a proper for existing quality");
                 return true;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
index 8cd175703..5073ca546 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
@@ -27,19 +27,19 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
         {
-            _logger.Trace("Beginning size check for: {0}", subject);
+            _logger.Debug("Beginning size check for: {0}", subject);
 
             var quality = subject.ParsedEpisodeInfo.Quality.Quality;
 
             if (quality == Quality.RAWHD)
             {
-                _logger.Trace("Raw-HD release found, skipping size check.");
+                _logger.Debug("Raw-HD release found, skipping size check.");
                 return true;
             }
 
             if (quality == Quality.Unknown)
             {
-                _logger.Trace("Unknown quality. skipping size check.");
+                _logger.Debug("Unknown quality. skipping size check.");
                 return false;
             }
 
@@ -52,12 +52,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             //If the parsed size is smaller than minSize we don't want it
             if (subject.Release.Size < minSize)
             {
-                _logger.Trace("Item: {0}, Size: {1} is smaller than minimum allowed size ({2}), rejecting.", subject, subject.Release.Size, minSize);
+                _logger.Debug("Item: {0}, Size: {1} is smaller than minimum allowed size ({2}), rejecting.", subject, subject.Release.Size, minSize);
                 return false;
             }
             if (qualityDefinition.MaxSize == 0)
             {
-                _logger.Trace("Max size is 0 (unlimited) - skipping check.");
+                _logger.Debug("Max size is 0 (unlimited) - skipping check.");
             }
             else
             {
@@ -75,11 +75,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
                 //If the parsed size is greater than maxSize we don't want it
                 if (subject.Release.Size > maxSize)
                 {
-                    _logger.Trace("Item: {0}, Size: {1} is greater than maximum allowed size ({2}), rejecting.", subject, subject.Release.Size, maxSize);
+                    _logger.Debug("Item: {0}, Size: {1} is greater than maximum allowed size ({2}), rejecting.", subject, subject.Release.Size, maxSize);
                     return false;
                 }
             }
-            _logger.Trace("Item: {0}, meets size constraints.", subject);
+            _logger.Debug("Item: {0}, meets size constraints.", subject);
             return true;
         }
     }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs
index 0b7e5166c..8d00b0d3b 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs
@@ -31,13 +31,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         {
             if (!_configService.EnableFailedDownloadHandling)
             {
-                _logger.Trace("Failed Download Handling is not enabled");
+                _logger.Debug("Failed Download Handling is not enabled");
                 return true;
             }
 
             if (_blacklistService.Blacklisted(subject.Series.Id, subject.Release.Title))
             {
-                _logger.Trace("{0} is blacklisted, rejecting.", subject.Release.Title);
+                _logger.Debug("{0} is blacklisted, rejecting.", subject.Release.Title);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
index e087c6ef3..7ede1ed8d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -28,12 +28,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         {
             foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
             {
-                _logger.Trace("Comparing file quality with report. Existing file is {0}", file.Quality);
+                _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality);
 
                 
                 if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality))
                 {
-                    _logger.Trace("Cutoff already met, rejecting.");
+                    _logger.Debug("Cutoff already met, rejecting.");
                     return false;
                 }
             }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs
index 1ed27c14d..1ec1eb76d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs
@@ -24,10 +24,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
         {
-            _logger.Trace("Checking if report meets language requirements. {0}", subject.ParsedEpisodeInfo.Language);
+            _logger.Debug("Checking if report meets language requirements. {0}", subject.ParsedEpisodeInfo.Language);
             if (subject.ParsedEpisodeInfo.Language != Language.English)
             {
-                _logger.Trace("Report Language: {0} rejected because it is not English", subject.ParsedEpisodeInfo.Language);
+                _logger.Debug("Report Language: {0} rejected because it is not English", subject.ParsedEpisodeInfo.Language);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs
index 7e4f34551..4fe2010de 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
             if (IsInQueue(subject, queue))
             {
-                _logger.Trace("Already in queue, rejecting.");
+                _logger.Debug("Already in queue, rejecting.");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
index 7ba369944..7a9e9f65c 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
@@ -27,13 +27,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
         {
-            _logger.Trace("Checking if release contains any restricted terms: {0}", subject);
+            _logger.Debug("Checking if release contains any restricted terms: {0}", subject);
 
             var restrictionsString = _configService.ReleaseRestrictions;
 
             if (String.IsNullOrWhiteSpace(restrictionsString))
             {
-                _logger.Trace("No restrictions configured, allowing: {0}", subject);
+                _logger.Debug("No restrictions configured, allowing: {0}", subject);
                 return true;
             }
 
@@ -43,12 +43,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             {
                 if (subject.Release.Title.ToLowerInvariant().Contains(restriction.ToLowerInvariant()))
                 {
-                    _logger.Trace("{0} is restricted: {1}", subject, restriction);
+                    _logger.Debug("{0} is restricted: {1}", subject, restriction);
                     return false;
                 }
             }
 
-            _logger.Trace("No restrictions apply, allowing: {0}", subject);
+            _logger.Debug("No restrictions apply, allowing: {0}", subject);
             return true;
         }
     }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
index 5d6a2da77..c5e193012 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         {
             if (subject.Release.Title.ToLower().Contains("sample") && subject.Release.Size < 70.Megabytes())
             {
-                _logger.Trace("Sample release, rejecting.");
+                _logger.Debug("Sample release, rejecting.");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
index b4bcc1f83..758d9b2d6 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
@@ -23,10 +23,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
         {
-            _logger.Trace("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality);
+            _logger.Debug("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality);
             if (!subject.Series.QualityProfile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedEpisodeInfo.Quality.Quality))
             {
-                _logger.Trace("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality);
+                _logger.Debug("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
index c74289e55..614794b92 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
@@ -30,10 +30,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
             var age = subject.Release.Age;
             var retention = _configService.Retention;
 
-            _logger.Trace("Checking if report meets retention requirements. {0}", age);
+            _logger.Debug("Checking if report meets retention requirements. {0}", age);
             if (retention > 0 && age > retention)
             {
-                _logger.Trace("Report age: {0} rejected by user's retention limit", age);
+                _logger.Debug("Report age: {0} rejected by user's retention limit", age);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
index 1624c6296..0132f4adf 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
@@ -37,21 +37,23 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
         {
             if (searchCriteria != null)
             {
-                _logger.Trace("Skipping history check during search");
+                _logger.Debug("Skipping history check during search");
                 return true;
             }
 
-            if (_downloadClientProvider.GetDownloadClient().GetType() == typeof (Sabnzbd))
+            var downloadClient = _downloadClientProvider.GetDownloadClient();
+
+            if (downloadClient != null && downloadClient.GetType() == typeof (Sabnzbd))
             {
-                _logger.Trace("Performing history status check on report");
+                _logger.Debug("Performing history status check on report");
                 foreach (var episode in subject.Episodes)
                 {
-                    _logger.Trace("Checking current status of episode [{0}] in history", episode.Id);
+                    _logger.Debug("Checking current status of episode [{0}] in history", episode.Id);
                     var mostRecent = _historyService.MostRecentForEpisode(episode.Id);
 
                     if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
                     {
-                        _logger.Trace("Latest history item is downloading, rejecting.");
+                        _logger.Debug("Latest history item is downloading, rejecting.");
                         return false;
                     }
                 }
@@ -63,7 +65,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                 var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.QualityProfile, episode.Id);
                 if (bestQualityInHistory != null)
                 {
-                    _logger.Trace("Comparing history quality with report. History is {0}", bestQualityInHistory);
+                    _logger.Debug("Comparing history quality with report. History is {0}", bestQualityInHistory);
                     if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, bestQualityInHistory, subject.ParsedEpisodeInfo.Quality))
                         return false;
                 }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs
index 2bd097e32..a0709622f 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
         {
             if (searchCriteria != null)
             {
-                _logger.Trace("Skipping monitored check during search");
+                _logger.Debug("Skipping monitored check during search");
                 return true;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
index 6d099eeba..0346ab28a 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
@@ -41,13 +41,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                 {
                     if (file.DateAdded < DateTime.Today.AddDays(-7))
                     {
-                        _logger.Trace("Proper for old file, rejecting: {0}", subject);
+                        _logger.Debug("Proper for old file, rejecting: {0}", subject);
                         return false;
                     }
 
                     if (!_configService.AutoDownloadPropers)
                     {
-                        _logger.Trace("Auto downloading of propers is disabled");
+                        _logger.Debug("Auto downloading of propers is disabled");
                         return false;
                     }
                 }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs
index cee1ae288..6698d49dd 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
 
             if (!remoteEpisode.ParsedEpisodeInfo.IsDaily() || remoteEpisode.ParsedEpisodeInfo.AirDate != episode.AirDate)
             {
-                _logger.Trace("Episode AirDate does not match searched episode number, skipping.");
+                _logger.Debug("Episode AirDate does not match searched episode number, skipping.");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs
index 7a42601e5..211870221 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
 
             if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
             {
-                _logger.Trace("Season number does not match searched season number, skipping.");
+                _logger.Debug("Season number does not match searched season number, skipping.");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs
index 8a30288d2..6e6f146f8 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs
@@ -28,11 +28,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
                 return true;
             }
 
-            _logger.Trace("Checking if series matches searched series");
+            _logger.Debug("Checking if series matches searched series");
 
             if (remoteEpisode.Series.Id != searchCriteria.Series.Id)
             {
-                _logger.Trace("Series {0} does not match {1}", remoteEpisode.Series, searchCriteria.Series);
+                _logger.Debug("Series {0} does not match {1}", remoteEpisode.Series, searchCriteria.Series);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs
index 7a8deeec9..3960a4e4d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs
@@ -34,13 +34,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search
 
             if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
             {
-                _logger.Trace("Season number does not match searched season number, skipping.");
+                _logger.Debug("Season number does not match searched season number, skipping.");
                 return false;
             }
 
             if (!remoteEpisode.ParsedEpisodeInfo.EpisodeNumbers.Contains(singleEpisodeSpec.EpisodeNumber))
             {
-                _logger.Trace("Episode number does not match searched episode number, skipping.");
+                _logger.Debug("Episode number does not match searched episode number, skipping.");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
index 8d2c5f631..833f4b9a5 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         {
             foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
             {
-                _logger.Trace("Comparing file quality with report. Existing file is {0}", file.Quality);
+                _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality);
 
                 if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality))
                 {
diff --git a/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs b/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs
index c183378fc..d04007166 100644
--- a/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs
+++ b/src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs
@@ -33,9 +33,9 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
             var filename = Path.Combine(Settings.Folder, title + ".nzb");
 
 
-            _logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
+            _logger.Debug("Downloading NZB from: {0} to: {1}", url, filename);
             _httpProvider.DownloadFile(url, filename);
-            _logger.Trace("NZB Download succeeded, saved to: {0}", filename);
+            _logger.Debug("NZB Download succeeded, saved to: {0}", filename);
 
             return null;
         }
diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
index e6d1bf54a..678a63a56 100644
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
         {
             var client = BuildClient(settings);
             var response = client.Execute(restRequest);
-            _logger.Trace("Response: {0}", response.Content);
+            _logger.Debug("Response: {0}", response.Content);
 
             CheckForError(response);
 
diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
index 2e93023bc..7b521d748 100644
--- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
+++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
@@ -43,10 +43,10 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
             //Save to the Pneumatic directory (The user will need to ensure its accessible by XBMC)
             var filename = Path.Combine(Settings.Folder, title + ".nzb");
 
-            logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
+            logger.Debug("Downloading NZB from: {0} to: {1}", url, filename);
             _httpProvider.DownloadFile(url, filename);
 
-            logger.Trace("NZB Download succeeded, saved to: {0}", filename);
+            logger.Debug("NZB Download succeeded, saved to: {0}", filename);
 
             var contents = String.Format("plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb={0}&nzbname={1}", filename, title);
             _diskProvider.WriteAllText(Path.Combine(_configService.DownloadedEpisodesFolder, title + ".strm"), contents);
diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
index c5ca48167..e3b987e4c 100644
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Download.Clients.Sabnzbd.Responses;
+using NzbDrone.Core.Instrumentation.Extensions;
 using RestSharp;
 
 namespace NzbDrone.Core.Download.Clients.Sabnzbd
@@ -124,7 +125,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                                  action,
                                  authentication);
 
-            _logger.Trace(url);
+            _logger.CleansedDebug(url);
 
             return new RestClient(url);
         }
diff --git a/src/NzbDrone.Core/Download/DownloadService.cs b/src/NzbDrone.Core/Download/DownloadService.cs
index 71e633d47..b8598cec1 100644
--- a/src/NzbDrone.Core/Download/DownloadService.cs
+++ b/src/NzbDrone.Core/Download/DownloadService.cs
@@ -1,7 +1,7 @@
 using System;
 using NLog;
 using NzbDrone.Common.EnsureThat;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser.Model;
 
diff --git a/src/NzbDrone.Core/Download/FailedDownloadService.cs b/src/NzbDrone.Core/Download/FailedDownloadService.cs
index f5438dea5..2805cc1c6 100644
--- a/src/NzbDrone.Core/Download/FailedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/FailedDownloadService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Common;
@@ -58,7 +59,7 @@ namespace NzbDrone.Core.Download
 
             if (!failedItems.Any())
             {
-                _logger.Trace("Yay! No encrypted downloads");
+                _logger.Debug("Yay! No encrypted downloads");
                 return;
             }
 
@@ -69,13 +70,13 @@ namespace NzbDrone.Core.Download
 
                 if (!historyItems.Any())
                 {
-                    _logger.Trace("Unable to find matching history item");
+                    _logger.Debug("Unable to find matching history item");
                     continue;
                 }
 
                 if (failedHistory.Any(h => failedLocal.Id.Equals(h.Data.GetValueOrDefault(DOWNLOAD_CLIENT_ID))))
                 {
-                    _logger.Trace("Already added to history as failed");
+                    _logger.Debug("Already added to history as failed");
                     continue;
                 }
 
@@ -103,7 +104,7 @@ namespace NzbDrone.Core.Download
 
             if (!failedItems.Any())
             {
-                _logger.Trace("Yay! No failed downloads");
+                _logger.Debug("Yay! No failed downloads");
                 return;
             }
 
@@ -114,13 +115,21 @@ namespace NzbDrone.Core.Download
 
                 if (!historyItems.Any())
                 {
-                    _logger.Trace("Unable to find matching history item");
+                    _logger.Debug("Unable to find matching history item");
+                    continue;
+                }
+
+                //TODO: Make this more configurable (ignore failure reasons) to support changes and other failures that should be ignored
+                if (failedLocal.Message.Equals("Unpacking failed, write error or disk is full?",
+                    StringComparison.InvariantCultureIgnoreCase))
+                {
+                    _logger.Debug("Failed due to lack of disk space, do not blacklist");
                     continue;
                 }
 
                 if (failedHistory.Any(h => failedLocal.Id.Equals(h.Data.GetValueOrDefault(DOWNLOAD_CLIENT_ID))))
                 {
-                    _logger.Trace("Already added to history as failed");
+                    _logger.Debug("Already added to history as failed");
                     continue;
                 }
 
@@ -164,7 +173,7 @@ namespace NzbDrone.Core.Download
 
             if (downloadClient == null)
             {
-                _logger.Trace("No download client is configured");
+                _logger.Debug("No download client is configured");
             }
 
             return downloadClient;
@@ -174,7 +183,7 @@ namespace NzbDrone.Core.Download
         {
             if (!_configService.EnableFailedDownloadHandling)
             {
-                _logger.Trace("Failed Download Handling is not enabled");
+                _logger.Debug("Failed Download Handling is not enabled");
                 return;
             }
 
diff --git a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
index 0182f7b26..b6e0c0de9 100644
--- a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
@@ -32,13 +32,13 @@ namespace NzbDrone.Core.Download
         {
             if (!_configService.AutoRedownloadFailed)
             {
-                _logger.Trace("Auto redownloading failed episodes is disabled");
+                _logger.Debug("Auto redownloading failed episodes is disabled");
                 return;
             }
 
             if (episodeIds.Count == 1)
             {
-                _logger.Trace("Failed download only contains one episode, searching again");
+                _logger.Debug("Failed download only contains one episode, searching again");
 
                 _commandExecutor.PublishCommandAsync(new EpisodeSearchCommand
                                                      {
@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Download
 
             if (episodeIds.Count == episodesInSeason.Count)
             {
-                _logger.Trace("Failed download was entire season, searching again");
+                _logger.Debug("Failed download was entire season, searching again");
 
                 _commandExecutor.PublishCommandAsync(new SeasonSearchCommand
                                                      {
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Download
                 return;
             }
 
-            _logger.Trace("Failed download contains multiple episodes, probably a double episode, searching again");
+            _logger.Debug("Failed download contains multiple episodes, probably a double episode, searching again");
 
             _commandExecutor.PublishCommandAsync(new EpisodeSearchCommand
             {
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs
new file mode 100644
index 000000000..ed24bf018
--- /dev/null
+++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Text.RegularExpressions;
+using NLog;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    public class MonoVersionCheck : IProvideHealthCheck
+    {
+        private readonly IProcessProvider _processProvider;
+        private readonly Logger _logger;
+        private static readonly Regex VersionRegex = new Regex(@"(?<=\W)(?<version>\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        public MonoVersionCheck(IProcessProvider processProvider, Logger logger)
+        {
+            _processProvider = processProvider;
+            _logger = logger;
+        }
+
+        public HealthCheck Check()
+        {
+            if (!OsInfo.IsMono)
+            {
+                return null;
+            }
+
+            var output = _processProvider.StartAndCapture("mono", "--version");
+
+            foreach (var line in output.Standard)
+            {
+                var versionMatch = VersionRegex.Match(line);
+
+                if (versionMatch.Success)
+                {
+                    var version = new Version(versionMatch.Groups["version"].Value);
+
+                    if (version >= new Version(3, 2))
+                    {
+                        _logger.Debug("mono version is 3.2 or better: {0}", version.ToString());
+                        return null;
+                    }
+                }
+            }
+
+            return new HealthCheck(HealthCheckResultType.Warning, "mono version is less than 3.2, upgrade for improved stability");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs b/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
index 6edfe72ca..6ad4bccc4 100644
--- a/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
+++ b/src/NzbDrone.Core/HealthCheck/HealthCheckService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration.Events;
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs
index ece5ce6c7..f11d30ef8 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running naming spec cleanup");
+            _logger.Debug("Running naming spec cleanup");
 
             var mapper = _database.GetDataMapper();
 
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
index 3ccb0c181..83c3e3d82 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running orphaned blacklist cleanup");
+            _logger.Debug("Running orphaned blacklist cleanup");
 
             var mapper = _database.GetDataMapper();
 
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFiles.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFiles.cs
index c11da71f1..3a6b661f5 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFiles.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFiles.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running orphaned episode files cleanup");
+            _logger.Debug("Running orphaned episode files cleanup");
 
             var mapper = _database.GetDataMapper();
 
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodes.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodes.cs
index a75a69ded..2c2792f04 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodes.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodes.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running orphaned episodes cleanup");
+            _logger.Debug("Running orphaned episodes cleanup");
 
             var mapper = _database.GetDataMapper();
 
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
index f715665fb..0b8e9d374 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running orphaned history cleanup");
+            _logger.Debug("Running orphaned history cleanup");
             CleanupOrphanedBySeries();
             CleanupOrphanedByEpisode();
         }
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
index a54497e30..88ee87ad3 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Running orphaned episode files cleanup");
+            _logger.Debug("Running orphaned episode files cleanup");
 
             DeleteOrphanedBySeries();
             DeleteOrphanedByEpisodeFile();
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs
index a75bebfdf..40c99aabd 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs
@@ -21,10 +21,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
         {
             if (BuildInfo.IsDebug)
             {
-                _logger.Trace("Not running scheduled task last execution cleanup during debug");
+                _logger.Debug("Not running scheduled task last execution cleanup during debug");
             }
 
-            _logger.Trace("Running scheduled task last execution cleanup");
+            _logger.Debug("Running scheduled task last execution cleanup");
 
             var mapper = _database.GetDataMapper();
             mapper.AddParameter("time", DateTime.UtcNow);
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/UpdateCleanTitleForSeries.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/UpdateCleanTitleForSeries.cs
index b01e24ab2..4242b56ac 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/UpdateCleanTitleForSeries.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/UpdateCleanTitleForSeries.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
 
         public void Clean()
         {
-            _logger.Trace("Updating CleanTitle for all series");
+            _logger.Debug("Updating CleanTitle for all series");
 
             var series = _seriesRepository.All().ToList();
 
diff --git a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
index f365b1fd5..9aec6bbc3 100644
--- a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
@@ -1,6 +1,6 @@
 using NLog;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Core.IndexerSearch
diff --git a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
index 006f2b9a8..9af07cf51 100644
--- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
@@ -8,7 +8,7 @@ using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
 using System.Linq;
diff --git a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
index 13b384856..4c164ceef 100644
--- a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
@@ -1,6 +1,6 @@
 using NLog;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Core.IndexerSearch
diff --git a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs
index 149440b91..9eca04157 100644
--- a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs
@@ -1,6 +1,6 @@
 using NLog;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Tv;
 
diff --git a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs
index 7009e748c..4bbca036f 100644
--- a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Parser.Model;
 using System.Linq;
 
@@ -36,7 +37,7 @@ namespace NzbDrone.Core.Indexers
 
             var result = Fetch(indexer, indexer.RecentFeed);
 
-            _logger.Debug("Finished processing feeds from " + indexer);
+            _logger.Debug("Finished processing feeds from {0} found {1} releases", indexer, result.Count);
 
             return result;
         }
@@ -115,7 +116,7 @@ namespace NzbDrone.Core.Indexers
             {
                 try
                 {
-                    _logger.Trace("Downloading Feed " + url);
+                    _logger.CleansedDebug("Downloading Feed " + url);
                     var xml = _httpProvider.DownloadString(url);
                     if (!string.IsNullOrWhiteSpace(xml))
                     {
diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index 7e6f8caad..cb89009b9 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                     Enable = false,
                     Name = "Nzb.su",
                     Implementation = GetType().Name,
-                    Settings = GetSettings("https://nzb.su", new List<Int32>())
+                    Settings = GetSettings("https://api.nzb.su", new List<Int32>())
                 });
 
                 list.Add(new IndexerDefinition
diff --git a/src/NzbDrone.Core/Indexers/RssParserBase.cs b/src/NzbDrone.Core/Indexers/RssParserBase.cs
index 29ad27ee2..0988c4f97 100644
--- a/src/NzbDrone.Core/Indexers/RssParserBase.cs
+++ b/src/NzbDrone.Core/Indexers/RssParserBase.cs
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Indexers
                 throw new SizeParsingException("Unable to parse size from: {0} [{1}]", reportInfo.Title, url);
             }
 
-            _logger.Trace("Parsed: {0} from: {1}", reportInfo, item.Title());
+            _logger.Trace("Parsed: {0}", item.Title());
 
             return PostProcessor(item, reportInfo);
         }
diff --git a/src/NzbDrone.Core/Indexers/RssSyncService.cs b/src/NzbDrone.Core/Indexers/RssSyncService.cs
index 8435a1549..8958d8e76 100644
--- a/src/NzbDrone.Core/Indexers/RssSyncService.cs
+++ b/src/NzbDrone.Core/Indexers/RssSyncService.cs
@@ -2,7 +2,7 @@
 using NLog;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Core.Indexers
diff --git a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
index 1ac73bd72..9f43eadbb 100644
--- a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
+++ b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Instrumentation
         {
             Layout = new SimpleLayout("${callsite:className=false:fileName=false:includeSourcePath=false:methodName=true}");
 
-            Rule = new LoggingRule("*", LogLevel.Debug, this);
+            Rule = new LoggingRule("*", LogLevel.Info, this);
 
             LogManager.Configuration.AddTarget("DbLogger", this);
             LogManager.Configuration.LoggingRules.Add(Rule);
diff --git a/src/NzbDrone.Core/Instrumentation/Extensions/LoggerCleansedExtensions.cs b/src/NzbDrone.Core/Instrumentation/Extensions/LoggerCleansedExtensions.cs
new file mode 100644
index 000000000..3fb154c8c
--- /dev/null
+++ b/src/NzbDrone.Core/Instrumentation/Extensions/LoggerCleansedExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Text.RegularExpressions;
+using NLog;
+
+namespace NzbDrone.Core.Instrumentation.Extensions
+{
+    public static class LoggerCleansedExtensions
+    {
+        private static readonly Regex CleansingRegex = new Regex(@"(?<=apikey=)(\w+?)(?=\W|$|_)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        public static void CleansedInfo(this Logger logger, string message, params object[] args)
+        {
+            var formattedMessage = String.Format(message, args);
+            LogCleansedMessage(logger, LogLevel.Info, formattedMessage);
+        }
+
+        public static void CleansedDebug(this Logger logger, string message, params object[] args)
+        {
+            var formattedMessage = String.Format(message, args);
+            LogCleansedMessage(logger, LogLevel.Debug, formattedMessage);
+        }
+
+        public static void CleansedTrace(this Logger logger, string message, params object[] args)
+        {
+            var formattedMessage = String.Format(message, args);
+            LogCleansedMessage(logger, LogLevel.Trace, formattedMessage);
+        }
+
+        private static void LogCleansedMessage(Logger logger, LogLevel level, string message)
+        {
+            message = Cleanse(message);
+
+            var logEvent = new LogEventInfo(level, logger.Name, message);
+
+            logger.Log(logEvent);
+        }
+
+        private static string Cleanse(string message)
+        {
+            //TODO: password=
+
+            return CleansingRegex.Replace(message, "<removed>");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Instrumentation/LoggerExtensions.cs b/src/NzbDrone.Core/Instrumentation/Extensions/LoggerProgressExtensions.cs
similarity index 95%
rename from src/NzbDrone.Core/Instrumentation/LoggerExtensions.cs
rename to src/NzbDrone.Core/Instrumentation/Extensions/LoggerProgressExtensions.cs
index 82ece28d2..6aeb5ecf7 100644
--- a/src/NzbDrone.Core/Instrumentation/LoggerExtensions.cs
+++ b/src/NzbDrone.Core/Instrumentation/Extensions/LoggerProgressExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using NLog;
 
-namespace NzbDrone.Core.Instrumentation
+namespace NzbDrone.Core.Instrumentation.Extensions
 {
     public static class LoggerExtensions
     {
diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs
index e775abb5f..65cc35f80 100644
--- a/src/NzbDrone.Core/Jobs/TaskManager.cs
+++ b/src/NzbDrone.Core/Jobs/TaskManager.cs
@@ -5,7 +5,6 @@ using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Configuration.Events;
 using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.DataAugmentation.Xem;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.HealthCheck;
 using NzbDrone.Core.Housekeeping;
@@ -40,14 +39,15 @@ namespace NzbDrone.Core.Jobs
 
         public IList<ScheduledTask> GetPending()
         {
-            return _scheduledTaskRepository.All().Where(c => c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow).ToList();
+            return _scheduledTaskRepository.All()
+                                           .Where(c => c.Interval > 0 && c.LastExecution.AddMinutes(c.Interval) < DateTime.UtcNow)
+                                           .ToList();
         }
 
         public void Handle(ApplicationStartedEvent message)
         {
             var defaultTasks = new[]
                 {
-                    new ScheduledTask{ Interval = _configService.RssSyncInterval, TypeName = typeof(RssSyncCommand).FullName},
                     new ScheduledTask{ Interval = 1, TypeName = typeof(DownloadedEpisodesScanCommand).FullName},
                     new ScheduledTask{ Interval = 1, TypeName = typeof(TrackedCommandCleanupCommand).FullName},
                     new ScheduledTask{ Interval = 1, TypeName = typeof(CheckForFailedDownloadCommand).FullName},
@@ -57,6 +57,18 @@ namespace NzbDrone.Core.Jobs
                     new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
                     new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshSeriesCommand).FullName},
                     new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
+
+                    new ScheduledTask
+                    { 
+                        Interval = _configService.RssSyncInterval,
+                        TypeName = typeof(RssSyncCommand).FullName
+                    },
+
+                    new ScheduledTask
+                    { 
+                        Interval = _configService.DownloadedEpisodesScanInterval,
+                        TypeName = typeof(DownloadedEpisodesScanCommand).FullName
+                    },
                 };
 
             var currentTasks = _scheduledTaskRepository.All().ToList();
@@ -93,7 +105,7 @@ namespace NzbDrone.Core.Jobs
 
             if (scheduledTask != null)
             {
-                _logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName);
+                _logger.Debug("Updating last run time for: {0}", scheduledTask.TypeName);
                 _scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow);
             }
         }
@@ -102,7 +114,11 @@ namespace NzbDrone.Core.Jobs
         {
             var rss = _scheduledTaskRepository.GetDefinition(typeof(RssSyncCommand));
             rss.Interval = _configService.RssSyncInterval;
-            _scheduledTaskRepository.Update(rss);
+
+            var downloadedEpisodes = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand));
+            downloadedEpisodes.Interval = _configService.DownloadedEpisodesScanInterval;
+
+            _scheduledTaskRepository.UpdateMany(new List<ScheduledTask>{ rss, downloadedEpisodes });
         }
     }
 }
diff --git a/src/NzbDrone.Core/Lifecycle/LifecycleService.cs b/src/NzbDrone.Core/Lifecycle/LifecycleService.cs
index 25199b49f..df5c017b1 100644
--- a/src/NzbDrone.Core/Lifecycle/LifecycleService.cs
+++ b/src/NzbDrone.Core/Lifecycle/LifecycleService.cs
@@ -1,9 +1,7 @@
-using System;
-using NLog;
+using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Processes;
-using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Lifecycle.Commands;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
@@ -48,22 +46,12 @@ namespace NzbDrone.Core.Lifecycle
         {
             _logger.Info("Restart requested.");
 
-            if (OsInfo.IsLinux)
-            {
-                _processProvider.SpawnNewProcess(_runtimeInfo.ExecutingApplication, "--terminateexisting --nobrowser");
-            }
-
             _eventAggregator.PublishEvent(new ApplicationShutdownRequested(true));
 
             if (_runtimeInfo.IsWindowsService)
             {
                 _serviceProvider.Restart(ServiceProvider.NZBDRONE_SERVICE_NAME);
             }
-
-            else
-            {
-                _processProvider.SpawnNewProcess(_runtimeInfo.ExecutingApplication, "--terminateexisting --nobrowser");
-            }
         }
     }
 }
diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
index a208f28bd..554a3dc51 100644
--- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
+++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.MediaCover
 
                 if (_diskProvider.FileExists(filePath))
                 {
-                    var lastWrite = _diskProvider.GetLastFileWrite(filePath);
+                    var lastWrite = _diskProvider.FileGetLastWriteUtc(filePath);
                     mediaCover.Url += "?lastWrite=" + lastWrite.Ticks;
                 }
             }
diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 0b1e51be6..c03e8ec0d 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -1,13 +1,12 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using NLog;
-using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
@@ -31,15 +30,17 @@ namespace NzbDrone.Core.MediaFiles
         private readonly ICommandExecutor _commandExecutor;
         private readonly IConfigService _configService;
         private readonly ISeriesService _seriesService;
+        private readonly IEventAggregator _eventAggregator;
         private readonly Logger _logger;
 
         public DiskScanService(IDiskProvider diskProvider,
-                                IMakeImportDecision importDecisionMaker,
-                                IImportApprovedEpisodes importApprovedEpisodes,
-                                ICommandExecutor commandExecutor,
-                                IConfigService configService,
-                                ISeriesService seriesService,
-                                Logger logger)
+                               IMakeImportDecision importDecisionMaker,
+                               IImportApprovedEpisodes importApprovedEpisodes,
+                               ICommandExecutor commandExecutor,
+                               IConfigService configService,
+                               ISeriesService seriesService,
+                               IEventAggregator eventAggregator,
+                               Logger logger)
         {
             _diskProvider = diskProvider;
             _importDecisionMaker = importDecisionMaker;
@@ -47,6 +48,7 @@ namespace NzbDrone.Core.MediaFiles
             _commandExecutor = commandExecutor;
             _configService = configService;
             _seriesService = seriesService;
+            _eventAggregator = eventAggregator;
             _logger = logger;
         }
 
@@ -75,7 +77,9 @@ namespace NzbDrone.Core.MediaFiles
 
             var decisions = _importDecisionMaker.GetImportDecisions(mediaFileList, series, false);
             _importApprovedEpisodes.Import(decisions);
+
             _logger.Info("Completed scanning disk for {0}", series.Title);
+            _eventAggregator.PublishEvent(new SeriesScannedEvent(series));
         }
 
         public string[] GetVideoFiles(string path, bool allDirectories = true)
diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
index cf82620de..b5531b32b 100644
--- a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
@@ -102,7 +102,7 @@ namespace NzbDrone.Core.MediaFiles
             var cleanedUpName = GetCleanedUpFolderName(subfolderInfo.Name);
             var series = _parsingService.GetSeries(cleanedUpName);
             var quality = QualityParser.ParseQuality(cleanedUpName);
-            _logger.Trace("{0} folder quality: {1}", cleanedUpName, quality);
+            _logger.Debug("{0} folder quality: {1}", cleanedUpName, quality);
 
             if (series == null)
             {
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
index 904fbb29e..34eac41c4 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NLog;
@@ -22,18 +23,21 @@ namespace NzbDrone.Core.MediaFiles
     public class EpisodeFileMovingService : IMoveEpisodeFiles
     {
         private readonly IEpisodeService _episodeService;
+        private readonly IUpdateEpisodeFileService _updateEpisodeFileService;
         private readonly IBuildFileNames _buildFileNames;
         private readonly IDiskProvider _diskProvider;
         private readonly IConfigService _configService;
         private readonly Logger _logger;
 
         public EpisodeFileMovingService(IEpisodeService episodeService,
+                                IUpdateEpisodeFileService updateEpisodeFileService,
                                 IBuildFileNames buildFileNames,
                                 IDiskProvider diskProvider,
                                 IConfigService configService,
                                 Logger logger)
         {
             _episodeService = episodeService;
+            _updateEpisodeFileService = updateEpisodeFileService;
             _buildFileNames = buildFileNames;
             _diskProvider = diskProvider;
             _configService = configService;
@@ -46,9 +50,9 @@ namespace NzbDrone.Core.MediaFiles
             var newFileName = _buildFileNames.BuildFilename(episodes, series, episodeFile);
             var filePath = _buildFileNames.BuildFilePath(series, episodes.First().SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
 
-            _logger.Trace("Renaming episode file: {0} to {1}", episodeFile, filePath);
+            _logger.Debug("Renaming episode file: {0} to {1}", episodeFile, filePath);
             
-            return MoveFile(episodeFile, series, filePath);
+            return MoveFile(episodeFile, series, episodes, filePath);
         }
 
         public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode)
@@ -56,12 +60,12 @@ namespace NzbDrone.Core.MediaFiles
             var newFileName = _buildFileNames.BuildFilename(localEpisode.Episodes, localEpisode.Series, episodeFile);
             var filePath = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
 
-            _logger.Trace("Moving episode file: {0} to {1}", episodeFile, filePath);
+            _logger.Debug("Moving episode file: {0} to {1}", episodeFile, filePath);
             
-            return MoveFile(episodeFile, localEpisode.Series, filePath);
+            return MoveFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath);
         }
 
-        private EpisodeFile MoveFile(EpisodeFile episodeFile, Series series, string destinationFilename)
+        private EpisodeFile MoveFile(EpisodeFile episodeFile, Series series, List<Episode> episodes, string destinationFilename)
         {
             Ensure.That(episodeFile, () => episodeFile).IsNotNull();
             Ensure.That(series,() => series).IsNotNull();
@@ -102,16 +106,18 @@ namespace NzbDrone.Core.MediaFiles
             _diskProvider.MoveFile(episodeFile.Path, destinationFilename);
             episodeFile.Path = destinationFilename;
 
+            _updateEpisodeFileService.ChangeFileDateForFile(episodeFile, series, episodes);
+
             try
             {
-                _logger.Trace("Setting last write time on series folder: {0}", series.Path);
+                _logger.Debug("Setting last write time on series folder: {0}", series.Path);
                 _diskProvider.FolderSetLastWriteTimeUtc(series.Path, episodeFile.DateAdded);
 
                 if (series.SeasonFolder)
                 {
                     var seasonFolder = Path.GetDirectoryName(destinationFilename);
 
-                    _logger.Trace("Setting last write time on season folder: {0}", seasonFolder);
+                    _logger.Debug("Setting last write time on season folder: {0}", seasonFolder);
                     _diskProvider.FolderSetLastWriteTimeUtc(seasonFolder, episodeFile.DateAdded);
                 }
             }
@@ -134,7 +140,7 @@ namespace NzbDrone.Core.MediaFiles
                     if (ex is UnauthorizedAccessException || ex is InvalidOperationException)
                     {
                         _logger.Debug("Unable to apply folder permissions to: ", destinationFilename);
-                        _logger.TraceException(ex.Message, ex);
+                        _logger.DebugException(ex.Message, ex);
                     }
 
                     else
@@ -169,7 +175,7 @@ namespace NzbDrone.Core.MediaFiles
                 if (ex is UnauthorizedAccessException || ex is InvalidOperationException)
                 {
                     _logger.Debug("Unable to apply permissions to: ", path);
-                    _logger.TraceException(ex.Message, ex);
+                    _logger.DebugException(ex.Message, ex);
                 }
                 else
                 {
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
index 85f0a4fc0..3c96c66d5 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
@@ -63,12 +63,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
                     {
                         if (quality != null && new QualityModelComparer(parsedEpisode.Series.QualityProfile).Compare(quality, parsedEpisode.Quality) > 0)
                         {
-                            _logger.Trace("Using quality from folder: {0}", quality);
+                            _logger.Debug("Using quality from folder: {0}", quality);
                             parsedEpisode.Quality = quality;
                         }
 
                         parsedEpisode.Size = _diskProvider.GetFileSize(file);
-                        _logger.Trace("Size: {0}", parsedEpisode.Size);
+                        _logger.Debug("Size: {0}", parsedEpisode.Size);
 
                         decision = GetDecision(parsedEpisode);
                     }
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs
index 32d6b9054..bad570bf4 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
             {
                 if (localEpisode.ExistingFile)
                 {
-                    _logger.Trace("Skipping free space check for existing episode");
+                    _logger.Debug("Skipping free space check for existing episode");
                     return true;
                 }
 
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
 
                 if (!freeSpace.HasValue)
                 {
-                    _logger.Trace("Free space check returned an invalid result for: {0}", path);
+                    _logger.Debug("Free space check returned an invalid result for: {0}", path);
                     return true;
                 }
 
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecification.cs
index 0bd8418f4..c6a5e9f5e 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecification.cs
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
         {
             if (localEpisode.ParsedEpisodeInfo.FullSeason)
             {
-                _logger.Trace("Single episode file detected as containing all episodes in the season");
+                _logger.Debug("Single episode file detected as containing all episodes in the season");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotInUseSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotInUseSpecification.cs
index ce9ee9ff5..8eb2beaed 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotInUseSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotInUseSpecification.cs
@@ -21,13 +21,13 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
         {
             if (localEpisode.ExistingFile)
             {
-                _logger.Trace("{0} is in series folder, skipping in use check", localEpisode.Path);
+                _logger.Debug("{0} is in series folder, skipping in use check", localEpisode.Path);
                 return true;
             }
 
             if (_diskProvider.IsFileLocked(localEpisode.Path))
             {
-                _logger.Trace("{0} is in use");
+                _logger.Debug("{0} is in use");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
index 7e2fd7ed6..11c7ce7cd 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
@@ -37,19 +37,19 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
         {
             if (localEpisode.ExistingFile)
             {
-                _logger.Trace("Existing file, skipping sample check");
+                _logger.Debug("Existing file, skipping sample check");
                 return true;
             }
 
             if (localEpisode.Series.SeriesType == SeriesTypes.Daily)
             {
-                _logger.Trace("Daily Series, skipping sample check");
+                _logger.Debug("Daily Series, skipping sample check");
                 return true;
             }
 
             if (localEpisode.SeasonNumber == 0)
             {
-                _logger.Trace("Special, skipping sample check");
+                _logger.Debug("Special, skipping sample check");
                 return true;
             }
 
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
 
             if (extension != null && extension.Equals(".flv", StringComparison.InvariantCultureIgnoreCase))
             {
-                _logger.Trace("Skipping sample check for .flv file");
+                _logger.Debug("Skipping sample check for .flv file");
                 return true;
             }
 
@@ -73,19 +73,19 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
 
                 if (runTime.TotalSeconds < 90)
                 {
-                    _logger.Trace("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
+                    _logger.Debug("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
                     return false;
                 }
             }
 
             catch (DllNotFoundException)
             {
-                _logger.Trace("Falling back to file size detection");
+                _logger.Debug("Falling back to file size detection");
 
                 return CheckSize(localEpisode);
             }
 
-            _logger.Trace("Runtime is over 90 seconds");
+            _logger.Debug("Runtime is over 90 seconds");
             return true;
         }
 
@@ -95,14 +95,14 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
             {
                 if (localEpisode.Size < SampleSizeLimit * 2)
                 {
-                    _logger.Trace("1080p file is less than sample limit");
+                    _logger.Debug("1080p file is less than sample limit");
                     return false;
                 }
             }
 
             if (localEpisode.Size < SampleSizeLimit)
             {
-                _logger.Trace("File is less than sample limit");
+                _logger.Debug("File is less than sample limit");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecification.cs
index 50279a4e2..3c52b1bb6 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecification.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
         {
             if (localEpisode.ExistingFile)
             {
-                _logger.Trace("{0} is in series folder, unpacking check", localEpisode.Path);
+                _logger.Debug("{0} is in series folder, unpacking check", localEpisode.Path);
                 return true;
             }
 
@@ -36,15 +36,15 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
             {
                 if (Directory.GetParent(localEpisode.Path).Name.StartsWith(workingFolder))
                 {
-                    if (OsInfo.IsLinux)
+                    if (OsInfo.IsMono)
                     {
-                        _logger.Trace("{0} is still being unpacked", localEpisode.Path);
+                        _logger.Debug("{0} is still being unpacked", localEpisode.Path);
                         return false;
                     }
 
-                    if (_diskProvider.GetLastFileWrite(localEpisode.Path) > DateTime.UtcNow.AddMinutes(-5))
+                    if (_diskProvider.FileGetLastWriteUtc(localEpisode.Path) > DateTime.UtcNow.AddMinutes(-5))
                     {
-                        _logger.Trace("{0} appears to be unpacking still", localEpisode.Path);
+                        _logger.Debug("{0} appears to be unpacking still", localEpisode.Path);
                         return false;
                     }
                 }
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
index c637ac5cd..e8dfbeda9 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
             var qualityComparer = new QualityModelComparer(localEpisode.Series.QualityProfile);
             if (localEpisode.Episodes.Any(e => e.EpisodeFileId != 0 && qualityComparer.Compare(e.EpisodeFile.Value.Quality, localEpisode.Quality) > 0))
             {
-                _logger.Trace("This file isn't an upgrade for all episodes. Skipping {0}", localEpisode.Path);
+                _logger.Debug("This file isn't an upgrade for all episodes. Skipping {0}", localEpisode.Path);
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/MediaFiles/Events/SeriesScannedEvent.cs b/src/NzbDrone.Core/MediaFiles/Events/SeriesScannedEvent.cs
new file mode 100644
index 000000000..f82de5214
--- /dev/null
+++ b/src/NzbDrone.Core/MediaFiles/Events/SeriesScannedEvent.cs
@@ -0,0 +1,15 @@
+using NzbDrone.Common.Messaging;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.MediaFiles.Events
+{
+    public class SeriesScannedEvent : IEvent
+    {
+        public Series Series { get; private set; }
+
+        public SeriesScannedEvent(Series series)
+        {
+            Series = series;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NzbDrone.Core/MediaFiles/FileDateType.cs b/src/NzbDrone.Core/MediaFiles/FileDateType.cs
new file mode 100644
index 000000000..6d78be960
--- /dev/null
+++ b/src/NzbDrone.Core/MediaFiles/FileDateType.cs
@@ -0,0 +1,9 @@
+namespace NzbDrone.Core.MediaFiles
+{
+    public enum FileDateType
+    {
+        None = 0,
+        LocalAirDate = 1,
+        UtcAirDate = 2
+    }
+}
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
index a897a1582..a51121511 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
@@ -43,21 +43,21 @@ namespace NzbDrone.Core.MediaFiles
                 {
                     if (!_diskProvider.FileExists(episodeFile.Path))
                     {
-                        _logger.Trace("File [{0}] no longer exists on disk, removing from db", episodeFile.Path);
+                        _logger.Debug("File [{0}] no longer exists on disk, removing from db", episodeFile.Path);
                         _mediaFileService.Delete(episodeFile);
                         continue;
                     }
 
                     if (!DiskProviderBase.IsParent(series.Path, episodeFile.Path))
                     {
-                        _logger.Trace("File [{0}] does not belong to this series, removing from db", episodeFile.Path);
+                        _logger.Debug("File [{0}] does not belong to this series, removing from db", episodeFile.Path);
                         _mediaFileService.Delete(episodeFile);
                         continue; 
                     }
 
                     if (!episodes.Any(e => e.EpisodeFileId == episodeFile.Id))
                     {
-                        _logger.Trace("File [{0}] is not assigned to any episodes, removing from db", episodeFile.Path);
+                        _logger.Debug("File [{0}] is not assigned to any episodes, removing from db", episodeFile.Path);
                         _mediaFileService.Delete(episodeFile);
                         continue;
                     }
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.MediaFiles
 //
 //                    if (localEpsiode == null || episodes.Count != localEpsiode.Episodes.Count)
 //                    {
-//                        _logger.Trace("File [{0}] parsed episodes has changed, removing from db", episodeFile.Path);
+//                        _logger.Debug("File [{0}] parsed episodes has changed, removing from db", episodeFile.Path);
 //                        _mediaFileService.Delete(episodeFile);
 //                        continue;
 //                    }
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
index 8429a4dbc..83c5debac 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
             try
             {
                 mediaInfo = new MediaInfoLib.MediaInfo();
-                _logger.Trace("Getting media info from {0}", filename);
+                _logger.Debug("Getting media info from {0}", filename);
 
                 mediaInfo.Option("ParseSpeed", "0.2");
                 int open = mediaInfo.Open(filename);
diff --git a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
index 4c5140c9a..ac4fa3c3d 100644
--- a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
+++ b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
@@ -50,10 +50,10 @@ namespace NzbDrone.Core.MediaFiles
             {
                 var destination = Path.Combine(recyclingBin, new DirectoryInfo(path).Name);
 
-                logger.Trace("Moving '{0}' to '{1}'", path, destination);
+                logger.Debug("Moving '{0}' to '{1}'", path, destination);
                 _diskProvider.MoveFolder(path, destination);
 
-                logger.Trace("Setting last accessed: {0}", path);
+                logger.Debug("Setting last accessed: {0}", path);
                 _diskProvider.FolderSetLastWriteTimeUtc(destination, DateTime.UtcNow);
                 foreach (var file in _diskProvider.GetFiles(destination, SearchOption.AllDirectories))
                 {
@@ -73,23 +73,23 @@ namespace NzbDrone.Core.MediaFiles
             {
                 logger.Info("Recycling Bin has not been configured, deleting permanently.");
 
-                if (!OsInfo.IsLinux)
+                if (!OsInfo.IsMono)
                 {
-                    logger.Trace(_diskProvider.GetFileAttributes(path));
+                    logger.Debug(_diskProvider.GetFileAttributes(path));
                 }
 
                 _diskProvider.DeleteFile(path);
-                logger.Trace("File has been permanently deleted: {0}", path);
+                logger.Debug("File has been permanently deleted: {0}", path);
             }
 
             else
             {
                 var destination = Path.Combine(recyclingBin, new FileInfo(path).Name);
 
-                logger.Trace("Moving '{0}' to '{1}'", path, destination);
+                logger.Debug("Moving '{0}' to '{1}'", path, destination);
                 _diskProvider.MoveFile(path, destination);
                 _diskProvider.FileSetLastWriteTimeUtc(destination, DateTime.UtcNow);
-                logger.Trace("File has been moved to the recycling bin: {0}", destination);
+                logger.Debug("File has been moved to the recycling bin: {0}", destination);
             }
         }
 
@@ -113,7 +113,7 @@ namespace NzbDrone.Core.MediaFiles
                 _diskProvider.DeleteFile(file);
             }
 
-            logger.Trace("Recycling Bin has been emptied.");
+            logger.Debug("Recycling Bin has been emptied.");
         }
 
         public void Cleanup()
@@ -128,9 +128,9 @@ namespace NzbDrone.Core.MediaFiles
 
             foreach (var folder in _diskProvider.GetDirectories(_configService.RecycleBin))
             {
-                if (_diskProvider.GetLastFolderWrite(folder).AddDays(7) > DateTime.UtcNow)
+                if (_diskProvider.FolderGetLastWrite(folder).AddDays(7) > DateTime.UtcNow)
                 {
-                    logger.Trace("Folder hasn't expired yet, skipping: {0}", folder);
+                    logger.Debug("Folder hasn't expired yet, skipping: {0}", folder);
                     continue;
                 }
 
@@ -139,16 +139,16 @@ namespace NzbDrone.Core.MediaFiles
 
             foreach (var file in _diskProvider.GetFiles(_configService.RecycleBin, SearchOption.TopDirectoryOnly))
             {
-                if (_diskProvider.GetLastFileWrite(file).AddDays(7) > DateTime.UtcNow)
+                if (_diskProvider.FileGetLastWriteUtc(file).AddDays(7) > DateTime.UtcNow)
                 {
-                    logger.Trace("File hasn't expired yet, skipping: {0}", file);
+                    logger.Debug("File hasn't expired yet, skipping: {0}", file);
                     continue;
                 }
 
                 _diskProvider.DeleteFile(file);
             }
 
-            logger.Trace("Recycling Bin has been cleaned up.");
+            logger.Debug("Recycling Bin has been cleaned up.");
         }
 
         public void HandleAsync(SeriesDeletedEvent message)
diff --git a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
index d66298c8c..060f3c3ba 100644
--- a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Commands;
@@ -115,17 +115,17 @@ namespace NzbDrone.Core.MediaFiles
             {
                 try
                 {
-                    _logger.Trace("Renaming episode file: {0}", episodeFile);
+                    _logger.Debug("Renaming episode file: {0}", episodeFile);
                     _episodeFileMover.MoveEpisodeFile(episodeFile, series);
 
                     _mediaFileService.Update(episodeFile);
                     renamed.Add(episodeFile);
 
-                    _logger.Trace("Renamed episode file: {0}", episodeFile);
+                    _logger.Debug("Renamed episode file: {0}", episodeFile);
                 }
                 catch (SameFilenameException ex)
                 {
-                    _logger.Trace("File not renamed, source and destination are the same: {0}", ex.Filename);
+                    _logger.Debug("File not renamed, source and destination are the same: {0}", ex.Filename);
                 }
                 catch (Exception ex)
                 {
@@ -151,7 +151,7 @@ namespace NzbDrone.Core.MediaFiles
 
         public void Execute(RenameSeriesCommand message)
         {
-            _logger.Trace("Renaming all files for selected series");
+            _logger.Debug("Renaming all files for selected series");
             var seriesToRename = _seriesService.GetSeries(message.SeriesIds);
 
             foreach (var series in seriesToRename)
diff --git a/src/NzbDrone.Core/MediaFiles/UpdateEpisodeFileService.cs b/src/NzbDrone.Core/MediaFiles/UpdateEpisodeFileService.cs
new file mode 100644
index 000000000..79eae53c2
--- /dev/null
+++ b/src/NzbDrone.Core/MediaFiles/UpdateEpisodeFileService.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NLog;
+using NzbDrone.Common;
+using NzbDrone.Common.Disk;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Instrumentation.Extensions;
+using NzbDrone.Core.MediaFiles.Events;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.MediaFiles
+{
+    public interface IUpdateEpisodeFileService
+    {
+        void ChangeFileDateForFile(EpisodeFile episodeFile, Series series, List<Episode> episodes);
+    }
+
+    public class UpdateEpisodeFileService : IUpdateEpisodeFileService,
+                                            IHandle<SeriesScannedEvent>
+    {
+        private readonly IDiskProvider _diskProvider;
+        private readonly IConfigService _configService;
+        private readonly IEpisodeService _episodeService;
+        private readonly Logger _logger;
+
+        public UpdateEpisodeFileService(IDiskProvider diskProvider,
+                                        IConfigService configService,
+                                        IEpisodeService episodeService,
+                                        Logger logger)
+        {
+            _diskProvider = diskProvider;
+            _configService = configService;
+            _episodeService = episodeService;
+            _logger = logger;
+        }
+
+        public void ChangeFileDateForFile(EpisodeFile episodeFile, Series series, List<Episode> episodes)
+        {
+            ChangeFileDate(episodeFile, series, episodes);
+        }
+
+        private bool ChangeFileDate(EpisodeFile episodeFile, Series series, List<Episode> episodes)
+        {
+            switch (_configService.FileDate)
+            {
+                case FileDateType.LocalAirDate:
+                {
+                    var airDate = episodes.First().AirDate;
+                    var airTime = series.AirTime;
+
+                    if (airDate.IsNullOrWhiteSpace() || airTime.IsNullOrWhiteSpace())
+                    {
+                        return false;
+                    }
+
+                    return ChangeFileDateToLocalAirDate(episodeFile.Path, airDate, airTime);
+                }
+
+                case FileDateType.UtcAirDate:
+                {
+                    var airDateUtc = episodes.First().AirDateUtc;
+
+                    if (!airDateUtc.HasValue)
+                    {
+                        return false;
+                    }
+
+                    return ChangeFileDateToUtcAirDate(episodeFile.Path, airDateUtc.Value);
+                }
+            }
+
+            return false;
+        }
+
+        public void Handle(SeriesScannedEvent message)
+        {
+            if (_configService.FileDate == FileDateType.None)
+            {
+                return;
+            }
+
+            var episodes = _episodeService.EpisodesWithFiles(message.Series.Id);
+
+            var episodeFiles = new List<EpisodeFile>();
+            var updated = new List<EpisodeFile>();
+
+            foreach (var group in episodes.GroupBy(e => e.EpisodeFileId))
+            {
+                var episodesInFile = group.Select(e => e).ToList();
+                var episodeFile = episodesInFile.First().EpisodeFile;
+
+                episodeFiles.Add(episodeFile);
+
+                if (ChangeFileDate(episodeFile, message.Series, episodesInFile))
+                {
+                    updated.Add(episodeFile);
+                }   
+            }
+
+            if (updated.Any())
+            {
+                _logger.ProgressDebug("Changed file date for {0} files of {1} in {2}", updated.Count, episodeFiles.Count, message.Series.Title);
+            }
+
+            else
+            {
+                _logger.ProgressDebug("No file dates changed for {0}", message.Series.Title);
+            }
+        }
+
+        private bool ChangeFileDateToLocalAirDate(string filePath, string fileDate, string fileTime)
+        {
+            DateTime airDate;
+
+            if (DateTime.TryParse(fileDate + ' ' + fileTime, out airDate))
+            {
+                // avoiding false +ve checks and set date skewing by not using UTC (Windows)
+                DateTime oldDateTime = _diskProvider.FileGetLastWriteUtc(filePath);
+
+                if (!DateTime.Equals(airDate, oldDateTime))
+                {
+                    try
+                    {
+                        _diskProvider.FileSetLastWriteTime(filePath, airDate);
+                        _logger.Debug("Date of file [{0}] changed from '{1}' to '{2}'", filePath, oldDateTime, airDate);
+
+                        return true;
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.WarnException("Unable to set date of file [" + filePath + "]", ex);
+                    }
+                }
+            }
+
+            else
+            {
+                _logger.Debug("Could not create valid date to change file [{0}]", filePath);
+            }
+
+            return false;
+        }
+
+        private bool ChangeFileDateToUtcAirDate(string filePath, DateTime airDateUtc)
+        {
+            DateTime oldLastWrite = _diskProvider.FileGetLastWriteUtc(filePath);
+
+            if (!DateTime.Equals(airDateUtc, oldLastWrite))
+            {
+                try
+                {
+                    _diskProvider.FileSetLastWriteTime(filePath, airDateUtc);
+                    _logger.Debug("Date of file [{0}] changed from '{1}' to '{2}'", filePath, oldLastWrite, airDateUtc);
+
+                    return true;
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.WarnException("Unable to set date of file [" + filePath + "]", ex);
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
index 7fa4d5612..c3cf4d208 100644
--- a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.MediaFiles
 
                 if (_diskProvider.FileExists(file.Path))
                 {
-                    _logger.Trace("Removing existing episode file: {0}", file);
+                    _logger.Debug("Removing existing episode file: {0}", file);
                     _recycleBinProvider.DeleteFile(file.Path);
                 }
 
diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
index 53943bacd..7ccdad4d7 100644
--- a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Messaging.Commands
 
             if (_trackCommands.FindExisting(command) != null)
             {
-                _logger.Debug("Command is already in progress: {0}", command.GetType().Name);
+                _logger.Trace("Command is already in progress: {0}", command.GetType().Name);
                 return;
             }
 
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Messaging.Commands
 
             if (existingCommand != null)
             {
-                _logger.Debug("Command is already in progress: {0}", command.GetType().Name);
+                _logger.Trace("Command is already in progress: {0}", command.GetType().Name);
                 return existingCommand;
             }
 
diff --git a/src/NzbDrone.Core/Messaging/Commands/TestCommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/TestCommandExecutor.cs
index 8e0ebfb71..f6c6094b5 100644
--- a/src/NzbDrone.Core/Messaging/Commands/TestCommandExecutor.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/TestCommandExecutor.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using NLog;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 
 namespace NzbDrone.Core.Messaging.Commands
 {
diff --git a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
index 2853dd57d..c5d41a047 100644
--- a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
+++ b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Messaging.Events
                 return eventType.Name;
             }
 
-            return string.Format("{0}<{1}>", eventType.Name.Remove(eventType.Name.IndexOf('`')), eventType.GetGenericArguments()[0].Name);
+            return String.Format("{0}<{1}>", eventType.Name.Remove(eventType.Name.IndexOf('`')), eventType.GetGenericArguments()[0].Name);
         }
     }
 }
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs
index d2bac9d22..4cc004bff 100644
--- a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs
+++ b/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs
@@ -151,7 +151,7 @@ namespace NzbDrone.Core.Metadata.Consumers.Xbmc
 
                     else
                     {
-                        _logger.Trace("Unknown episode file metadata: {0}", metadataFile.RelativePath);
+                        _logger.Debug("Unknown episode file metadata: {0}", metadataFile.RelativePath);
                         continue;
                     }
 
@@ -237,7 +237,7 @@ namespace NzbDrone.Core.Metadata.Consumers.Xbmc
 
         private MetadataFile WriteTvShowNfo(Series series, List<MetadataFile> existingMetadataFiles)
         {
-            _logger.Trace("Generating tvshow.nfo for: {0}", series.Title);
+            _logger.Debug("Generating tvshow.nfo for: {0}", series.Title);
             var sb = new StringBuilder();
             var xws = new XmlWriterSettings();
             xws.OmitXmlDeclaration = true;
@@ -310,7 +310,7 @@ namespace NzbDrone.Core.Metadata.Consumers.Xbmc
                 //TODO: Do we want to overwrite the file if it exists?
                 if (_diskProvider.FileExists(destination))
                 {
-                    _logger.Trace("Series image: {0} already exists.", image.CoverType);
+                    _logger.Debug("Series image: {0} already exists.", image.CoverType);
                     continue;
                 }
 
@@ -453,7 +453,7 @@ namespace NzbDrone.Core.Metadata.Consumers.Xbmc
 
             if (screenshot == null)
             {
-                _logger.Trace("Episode screenshot not available");
+                _logger.Debug("Episode screenshot not available");
                 return null;
             }
 
diff --git a/src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs b/src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs
index cdcbb0088..01944f441 100644
--- a/src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs
+++ b/src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Metadata.Files
 
         public void Clean(Series series)
         {
-            _logger.Trace("Cleaning missing metadata files for series: {0}", series.Title);
+            _logger.Debug("Cleaning missing metadata files for series: {0}", series.Title);
 
             var metadataFiles = _metadataFileService.GetFilesBySeries(series.Id);
 
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Metadata.Files
             {
                 if (!_diskProvider.FileExists(Path.Combine(series.Path, metadataFile.RelativePath)))
                 {
-                    _logger.Trace("Deleting metadata file from database: {0}", metadataFile.RelativePath);
+                    _logger.Debug("Deleting metadata file from database: {0}", metadataFile.RelativePath);
                     _metadataFileService.Delete(metadataFile.Id);
                 }
             }
diff --git a/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs b/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs
index 4c5d89aa1..cf625706f 100644
--- a/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs
+++ b/src/NzbDrone.Core/Metadata/ExistingMetadataService.cs
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Metadata
         {
             if (!_diskProvider.FolderExists(message.Series.Path)) return;
 
-            _logger.Trace("Looking for existing metadata in {0}", message.Series.Path);
+            _logger.Debug("Looking for existing metadata in {0}", message.Series.Path);
 
             var filesOnDisk = _diskProvider.GetFiles(message.Series.Path, SearchOption.AllDirectories);
             var possibleMetadataFiles = filesOnDisk.Where(c => !MediaFileExtensions.Extensions.Contains(Path.GetExtension(c).ToLower())).ToList();
@@ -60,13 +60,13 @@ namespace NzbDrone.Core.Metadata
 
                         if (localEpisode == null)
                         {
-                            _logger.Trace("Cannot find related episodes for: {0}", possibleMetadataFile);
+                            _logger.Debug("Cannot find related episodes for: {0}", possibleMetadataFile);
                             break;
                         }
 
                         if (localEpisode.Episodes.DistinctBy(e => e.EpisodeFileId).Count() > 1)
                         {
-                            _logger.Trace("Metadata file: {0} does not match existing files.", possibleMetadataFile);
+                            _logger.Debug("Metadata file: {0} does not match existing files.", possibleMetadataFile);
                             break;
                         }
 
diff --git a/src/NzbDrone.Core/Metadata/Files/MetadataFileService.cs b/src/NzbDrone.Core/Metadata/Files/MetadataFileService.cs
index e53c403af..5aad2a1df 100644
--- a/src/NzbDrone.Core/Metadata/Files/MetadataFileService.cs
+++ b/src/NzbDrone.Core/Metadata/Files/MetadataFileService.cs
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Metadata.Files
 
         public void HandleAsync(SeriesDeletedEvent message)
         {
-            _logger.Trace("Deleting Metadata from database for series: {0}", message.Series);
+            _logger.Debug("Deleting Metadata from database for series: {0}", message.Series);
             _repository.DeleteForSeries(message.Series.Id);
         }
 
@@ -101,7 +101,7 @@ namespace NzbDrone.Core.Metadata.Files
                 }
             }
 
-            _logger.Trace("Deleting Metadata from database for episode file: {0}", episodeFile);
+            _logger.Debug("Deleting Metadata from database for episode file: {0}", episodeFile);
             _repository.DeleteForEpisodeFile(episodeFile.Id);
         }
 
diff --git a/src/NzbDrone.Core/Metadata/MetadataBase.cs b/src/NzbDrone.Core/Metadata/MetadataBase.cs
index 04be5860a..3bebd9d90 100644
--- a/src/NzbDrone.Core/Metadata/MetadataBase.cs
+++ b/src/NzbDrone.Core/Metadata/MetadataBase.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Metadata
             {
                 if (_diskProvider.FileExists(path))
                 {
-                    _logger.Trace("Image already exists: {0}, will not download again.", path);
+                    _logger.Debug("Image already exists: {0}, will not download again.", path);
                     return;
                 }
 
diff --git a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
index 86d7cc94f..2743ab083 100644
--- a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.MetadataSource
             series.Overview = show.overview;
             series.Runtime = show.runtime;
             series.Network = show.network;
-            series.AirTime = show.air_time_utc;
+            series.AirTime = show.air_time;
             series.TitleSlug = show.url.ToLower().Replace("http://trakt.tv/show/", "");
             series.Status = GetSeriesStatus(show.status, show.ended);
             series.Ratings = GetRatings(show.ratings);
diff --git a/src/NzbDrone.Core/Notifications/Email/EmailService.cs b/src/NzbDrone.Core/Notifications/Email/EmailService.cs
index e103b144c..7e3e5b504 100644
--- a/src/NzbDrone.Core/Notifications/Email/EmailService.cs
+++ b/src/NzbDrone.Core/Notifications/Email/EmailService.cs
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Notifications.Email
             catch(Exception ex)
             {
                 _logger.Error("Error sending email. Subject: {0}", email.Subject);
-                _logger.TraceException(ex.Message, ex);
+                _logger.DebugException(ex.Message, ex);
             }
         }
 
diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
index cfcba9ba6..ce0ca87ef 100644
--- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
+++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
@@ -35,13 +35,13 @@ namespace NzbDrone.Core.Notifications.Growl
 
             _growlConnector = new GrowlConnector(password, hostname, port);
 
-            Logger.Trace("Sending Notification to: {0}:{1}", hostname, port);
+            Logger.Debug("Sending Notification to: {0}:{1}", hostname, port);
             _growlConnector.Notify(notification);
         }
 
         private void Register(string host, int port, string password)
         {
-            Logger.Trace("Registering NzbDrone with Growl host: {0}:{1}", host, port);
+            Logger.Debug("Registering NzbDrone with Growl host: {0}:{1}", host, port);
             _growlConnector = new GrowlConnector(password, host, port);
             _growlConnector.Register(_growlApplication, _notificationTypes.ToArray());
         }
diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexService.cs b/src/NzbDrone.Core/Notifications/Plex/PlexService.cs
index 9ff7abc03..fc02d0cc7 100644
--- a/src/NzbDrone.Core/Notifications/Plex/PlexService.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexService.cs
@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Notifications.Plex
         {
             try
             {
-                _logger.Trace("Sending Update Request to Plex Server");
+                _logger.Debug("Sending Update Request to Plex Server");
                 var sections = GetSectionKeys(settings);
                 sections.ForEach(s => UpdateSection(settings, s));
             }
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Notifications.Plex
 
         public List<int> GetSectionKeys(PlexServerSettings settings)
         {
-            _logger.Trace("Getting sections from Plex host: {0}", settings.Host);
+            _logger.Debug("Getting sections from Plex host: {0}", settings.Host);
             var url = String.Format("http://{0}:{1}/library/sections", settings.Host, settings.Port);
             var xmlStream = _httpProvider.DownloadStream(url, null);
             var xDoc = XDocument.Load(xmlStream);
@@ -68,7 +68,7 @@ namespace NzbDrone.Core.Notifications.Plex
 
         public void UpdateSection(PlexServerSettings settings, int key)
         {
-            _logger.Trace("Updating Plex host: {0}, Section: {1}", settings.Host, key);
+            _logger.Debug("Updating Plex host: {0}, Section: {1}", settings.Host, key);
             var url = String.Format("http://{0}:{1}/library/sections/{2}/refresh", settings.Host, settings.Port, key);
             _httpProvider.DownloadString(url);
         }
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.Notifications.Plex
 
         public void Execute(TestPlexClientCommand message)
         {
-            _logger.Trace("Sending Test Notifcation to Plex Client: {0}", message.Host);
+            _logger.Debug("Sending Test Notifcation to Plex Client: {0}", message.Host);
             var command = String.Format("ExecBuiltIn(Notification({0}, {1}))", "Test Notification", "Success! Notifications are setup correctly");
             var result = SendCommand(message.Host, message.Port, command, message.Username, message.Password);
 
diff --git a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs
index eb452f50a..7742b2f05 100644
--- a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs
+++ b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Notifications.Prowl
 
                 var client = new ProwlClient();
 
-                _logger.Trace("Sending Prowl Notification");
+                _logger.Debug("Sending Prowl Notification");
 
                 var notificationResult = client.SendNotification(notification);
 
@@ -48,7 +48,7 @@ namespace NzbDrone.Core.Notifications.Prowl
 
             catch (Exception ex)
             {
-                _logger.TraceException(ex.Message, ex);
+                _logger.DebugException(ex.Message, ex);
                 _logger.Warn("Invalid API Key: {0}", apiKey);
             }
         }
@@ -62,7 +62,7 @@ namespace NzbDrone.Core.Notifications.Prowl
 
                 var client = new ProwlClient();
 
-                _logger.Trace("Verifying API Key: {0}", apiKey);
+                _logger.Debug("Verifying API Key: {0}", apiKey);
 
                 var verificationResult = client.SendVerification(verificationRequest);
                 if (!String.IsNullOrWhiteSpace(verificationResult.ErrorMessage) &&
@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Notifications.Prowl
 
             catch (Exception ex)
             {
-                _logger.TraceException(ex.Message, ex);
+                _logger.DebugException(ex.Message, ex);
                 _logger.Warn("Invalid API Key: {0}", apiKey);
                 throw new InvalidApiKeyException("API Key: " + apiKey + " is invalid");
             }
diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs
index 375590a0b..7723a81f0 100644
--- a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Notifications.PushBullet
         [FieldDefinition(0, Label = "API Key", HelpLink = "https://www.pushbullet.com/")]
         public String ApiKey { get; set; }
 
-        [FieldDefinition(1, Label = "Device ID")]
+        [FieldDefinition(1, Label = "Device ID", HelpText = "device_iden in the device's URL on pubshbullet.com")]
         public String DeviceId { get; set; }
 
         public bool IsValid
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
index 6178056f9..1cb2e70b4 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
         {
             if (!settings.AlwaysUpdate)
             {
-                _logger.Trace("Determining if there are any active players on XBMC host: {0}", settings.Address);
+                _logger.Debug("Determining if there are any active players on XBMC host: {0}", settings.Address);
                 var activePlayers = GetActivePlayers(settings);
 
                 if (activePlayers.Any(a => a.Type.Equals("video")))
@@ -77,7 +77,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
         public bool CheckForError(string response)
         {
-            _logger.Trace("Looking for error in response: {0}", response);
+            _logger.Debug("Looking for error in response: {0}", response);
 
             if (String.IsNullOrWhiteSpace(response))
             {
@@ -92,7 +92,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
                 var errorMessage = response.Substring(errorIndex + 6);
                 errorMessage = errorMessage.Substring(0, errorMessage.IndexOfAny(new char[] { '<', ';' }));
 
-                _logger.Trace("Error found in response: {0}", errorMessage);
+                _logger.Debug("Error found in response: {0}", errorMessage);
                 return true;
             }
 
@@ -141,13 +141,13 @@ namespace NzbDrone.Core.Notifications.Xbmc
         {
             try
             {
-                _logger.Trace("Sending Update DB Request to XBMC Host: {0}", settings.Address);
+                _logger.Debug("Sending Update DB Request to XBMC Host: {0}", settings.Address);
                 var xbmcSeriesPath = GetSeriesPath(settings, series);
 
                 //If the path is found update it, else update the whole library
                 if (!String.IsNullOrEmpty(xbmcSeriesPath))
                 {
-                    _logger.Trace("Updating series [{0}] on XBMC host: {1}", series, settings.Address);
+                    _logger.Debug("Updating series [{0}] on XBMC host: {1}", series, settings.Address);
                     var command = BuildExecBuiltInCommand(String.Format("UpdateLibrary(video,{0})", xbmcSeriesPath));
                     SendCommand(settings, command);
                 }
@@ -155,7 +155,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
                 else
                 {
                     //Update the entire library
-                    _logger.Trace("Series [{0}] doesn't exist on XBMC host: {1}, Updating Entire Library", series, settings.Address);
+                    _logger.Debug("Series [{0}] doesn't exist on XBMC host: {1}, Updating Entire Library", series, settings.Address);
                     var command = BuildExecBuiltInCommand("UpdateLibrary(video)");
                     SendCommand(settings, command);
                 }
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
index 58f28c7e4..99f40d830 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
         {
             if (!settings.AlwaysUpdate)
             {
-                _logger.Trace("Determining if there are any active players on XBMC host: {0}", settings.Address);
+                _logger.Debug("Determining if there are any active players on XBMC host: {0}", settings.Address);
                 var activePlayers = GetActivePlayers(settings);
 
                 if (activePlayers.Any(a => a.Type.Equals("video")))
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
         public bool CheckForError(string response)
         {
-            _logger.Trace("Looking for error in response: {0}", response);
+            _logger.Debug("Looking for error in response: {0}", response);
 
             if (String.IsNullOrWhiteSpace(response))
             {
@@ -114,7 +114,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
             if (!allSeries.Any())
             {
-                _logger.Trace("No TV shows returned from XBMC");
+                _logger.Debug("No TV shows returned from XBMC");
                 return null;
             }
 
@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
                 if (seriesPath != null)
                 {
-                    _logger.Trace("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address);
+                    _logger.Debug("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address);
 
                     var parameters = new JObject(new JObject(new JProperty("directory", seriesPath)));
                     postJson = BuildJsonRequest("VideoLibrary.Scan", parameters);
@@ -148,7 +148,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
                 else
                 {
-                    _logger.Trace("Series {0} doesn't exist on XBMC host: {1}, Updating Entire Library", series,
+                    _logger.Debug("Series {0} doesn't exist on XBMC host: {1}, Updating Entire Library", series,
                                  settings.Address);
 
                     postJson = BuildJsonRequest("VideoLibrary.Scan");
@@ -158,12 +158,12 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
                 if (CheckForError(response)) return;
 
-                _logger.Trace(" from response");
+                _logger.Debug(" from response");
                 var result = Json.Deserialize<XbmcJsonResult<String>>(response);
 
                 if (!result.Result.Equals("OK", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    _logger.Trace("Failed to update library for: {0}", settings.Address);
+                    _logger.Debug("Failed to update library for: {0}", settings.Address);
                 }
             }
 
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
index 3ffbeba98..3a1ac4249 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
 
                 var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString());
 
-                Logger.Trace("Getting version from response");
+                Logger.Debug("Getting version from response");
                 var result = Json.Deserialize<XbmcJsonResult<JObject>>(response);
 
                 var versionObject = result.Result.Property("version");
@@ -108,9 +108,9 @@ namespace NzbDrone.Core.Notifications.Xbmc
                                    DisplayTime = message.DisplayTime
                                };
              
-            Logger.Trace("Determining version of XBMC Host: {0}", settings.Address);
+            Logger.Debug("Determining version of XBMC Host: {0}", settings.Address);
             var version = GetJsonVersion(settings);
-            Logger.Trace("Version is: {0}", version);
+            Logger.Debug("Version is: {0}", version);
 
             if (version == new XbmcVersion(0))
             {
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 166fee736..5f619fad6 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -114,6 +114,7 @@
     <Compile Include="Configuration\Events\ConfigSavedEvent.cs" />
     <Compile Include="Configuration\IConfigService.cs" />
     <Compile Include="Configuration\InvalidConfigFileException.cs" />
+    <Compile Include="Configuration\ResetApiKeyCommand.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxy.cs" />
     <Compile Include="DataAugmentation\DailySeries\DailySeriesService.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMapping.cs" />
@@ -190,6 +191,7 @@
     <Compile Include="Datastore\Migration\044_fix_xbmc_episode_metadata.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Datastore\Migration\046_fix_nzb_su_url.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationExtension.cs" />
@@ -267,6 +269,7 @@
     <Compile Include="Exceptions\StatusCodeToExceptions.cs" />
     <Compile Include="HealthCheck\CheckHealthCommand.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientCheck.cs" />
+    <Compile Include="HealthCheck\Checks\MonoVersionCheck.cs" />
     <Compile Include="HealthCheck\Checks\DroneFactoryCheck.cs" />
     <Compile Include="HealthCheck\Checks\IndexerCheck.cs" />
     <Compile Include="HealthCheck\Checks\UpdateCheck.cs" />
@@ -308,6 +311,8 @@
     <Compile Include="Instrumentation\Commands\DeleteLogFilesCommand.cs" />
     <Compile Include="Instrumentation\Commands\TrimLogCommand.cs" />
     <Compile Include="Instrumentation\DeleteLogFilesService.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerCleansedExtensions.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
     <Compile Include="MediaFiles\Commands\RenameSeriesCommand.cs" />
     <Compile Include="MediaFiles\Commands\RescanSeriesCommand.cs" />
     <Compile Include="Lifecycle\Commands\ShutdownCommand.cs" />
@@ -317,9 +322,12 @@
     <Compile Include="MediaFiles\Commands\RenameFilesCommand.cs" />
     <Compile Include="MediaFiles\EpisodeFileMoveResult.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecification.cs" />
+    <Compile Include="MediaFiles\Events\SeriesScannedEvent.cs" />
+    <Compile Include="MediaFiles\FileDateType.cs" />
     <Compile Include="MediaFiles\MediaFileExtensions.cs" />
     <Compile Include="MediaFiles\MediaInfo\VideoFileInfoReader.cs" />
     <Compile Include="MediaFiles\RenameEpisodeFilePreview.cs" />
+    <Compile Include="MediaFiles\UpdateEpisodeFileService.cs" />
     <Compile Include="Messaging\Commands\CommandExecutor.cs" />
     <Compile Include="Messaging\Commands\ICommandExecutor.cs" />
     <Compile Include="Messaging\Commands\IExecute.cs" />
@@ -365,7 +373,6 @@
     <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidProxy.cs" />
     <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidSettings.cs" />
     <Compile Include="Notifications\NotifyMyAndroid\TestNotifyMyAndroidCommand.cs" />
-    <Compile Include="Instrumentation\LoggerExtensions.cs" />
     <Compile Include="MediaFiles\Commands\BackendCommandAttribute.cs" />
     <Compile Include="Messaging\Commands\BackendCommandAttribute.cs" />
     <Compile Include="Messaging\Commands\Command.cs" />
diff --git a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
index c920bd8aa..332c851e2 100644
--- a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
@@ -29,5 +29,10 @@ namespace NzbDrone.Core.Parser.Model
         }
 
         public int TvRageId { get; set; }
+
+        public override string ToString()
+        {
+            return String.Format("[{0}] {1} [{2}]", PublishDate, Title, Size);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index 4f1b52395..883b7af97 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -100,7 +99,7 @@ namespace NzbDrone.Core.Parser
                     RegexOptions.IgnoreCase | RegexOptions.Compiled)
             };
 
-        private static readonly Regex NormalizeRegex = new Regex(@"((?:\b|_)(a|an|the|and|or|of)(?:\b|_))|\W|_",
+        private static readonly Regex NormalizeRegex = new Regex(@"((?:\b|_)(?<!^)(a|an|the|and|or|of)(?:\b|_))|\W|_",
                                                                  RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         private static readonly Regex SimpleTitleRegex = new Regex(@"480[i|p]|720[i|p]|1080[i|p]|[x|h|x\s|h\s]264|DD\W?5\W1|\<|\>|\?|\*|\:|\|",
@@ -129,7 +128,7 @@ namespace NzbDrone.Core.Parser
 
             if (result == null)
             {
-                Logger.Trace("Attempting to parse episode info using full path. {0}", fileInfo.FullName);
+                Logger.Debug("Attempting to parse episode info using full path. {0}", fileInfo.FullName);
                 result = ParseTitle(fileInfo.FullName);
             }
 
@@ -150,7 +149,7 @@ namespace NzbDrone.Core.Parser
             {
                 if (!ValidateBeforeParsing(title)) return null;
 
-                Logger.Trace("Parsing string '{0}'", title);
+                Logger.Debug("Parsing string '{0}'", title);
                 var simpleTitle = SimpleTitleRegex.Replace(title, String.Empty);
 
                 foreach (var regex in ReportTitleRegex)
@@ -166,20 +165,20 @@ namespace NzbDrone.Core.Parser
                             if (result != null)
                             {
                                 result.Language = ParseLanguage(title);
-                                Logger.Trace("Language parsed: {0}", result.Language);
+                                Logger.Debug("Language parsed: {0}", result.Language);
 
                                 result.Quality = QualityParser.ParseQuality(title);
-                                Logger.Trace("Quality parsed: {0}", result.Quality);
+                                Logger.Debug("Quality parsed: {0}", result.Quality);
 
                                 result.ReleaseGroup = ParseReleaseGroup(title);
-                                Logger.Trace("Release Group parsed: {0}", result.ReleaseGroup);
+                                Logger.Debug("Release Group parsed: {0}", result.ReleaseGroup);
 
                                 return result;
                             }
                         }
                         catch (InvalidDateException ex)
                         {
-                            Logger.TraceException(ex.Message, ex);
+                            Logger.DebugException(ex.Message, ex);
                             break;
                         }
                     }
@@ -191,13 +190,13 @@ namespace NzbDrone.Core.Parser
                     Logger.ErrorException("An error has occurred while trying to parse " + title, e);
             }
 
-            Logger.Trace("Unable to parse {0}", title);
+            Logger.Debug("Unable to parse {0}", title);
             return null;
         }
 
         public static string ParseSeriesName(string title)
         {
-            Logger.Trace("Parsing string '{0}'", title);
+            Logger.Debug("Parsing string '{0}'", title);
 
             var parseResult = ParseTitle(title);
 
@@ -402,7 +401,7 @@ namespace NzbDrone.Core.Parser
             result.SeriesTitle = CleanSeriesTitle(seriesName);
             result.SeriesTitleInfo = GetSeriesTitleInfo(result.SeriesTitle);
 
-            Logger.Trace("Episode Parsed. {0}", result);
+            Logger.Debug("Episode Parsed. {0}", result);
 
             return result;
         }
@@ -492,7 +491,7 @@ namespace NzbDrone.Core.Parser
         {
             if (title.ToLower().Contains("password") && title.ToLower().Contains("yenc"))
             {
-                Logger.Trace("");
+                Logger.Debug("");
                 return false;
             }
 
diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs
index 7028a8f95..35f73caf8 100644
--- a/src/NzbDrone.Core/Parser/ParsingService.cs
+++ b/src/NzbDrone.Core/Parser/ParsingService.cs
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Parser
 
             if (!episodes.Any())
             {
-                _logger.Trace("No matching episodes found for: {0}", parsedEpisodeInfo);
+                _logger.Debug("No matching episodes found for: {0}", parsedEpisodeInfo);
                 return null;
             }
 
@@ -256,7 +256,7 @@ namespace NzbDrone.Core.Parser
 
             if (series == null)
             {
-                _logger.Trace("No matching series {0}", title);
+                _logger.Debug("No matching series {0}", title);
                 return null;
             }
 
@@ -325,7 +325,7 @@ namespace NzbDrone.Core.Parser
 
             if (series == null)
             {
-                _logger.Trace("No matching series {0}", parsedEpisodeInfo.SeriesTitle);
+                _logger.Debug("No matching series {0}", parsedEpisodeInfo.SeriesTitle);
                 return null;
             }
 
diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs
index d5a1d4e13..c21cb3e19 100644
--- a/src/NzbDrone.Core/Parser/QualityParser.cs
+++ b/src/NzbDrone.Core/Parser/QualityParser.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Parser
 
         public static QualityModel ParseQuality(string name)
         {
-            Logger.Trace("Trying to parse quality for {0}", name);
+            Logger.Debug("Trying to parse quality for {0}", name);
 
             name = name.Trim();
             var normalizedName = name.CleanSeriesTitle();
diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs
index 899b41b1a..e195f57e4 100644
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Queue
 
             if (downloadClient == null)
             {
-                _logger.Trace("Download client is not configured.");
+                _logger.Debug("Download client is not configured.");
                 return new List<Queue>();
             }
 
diff --git a/src/NzbDrone.Core/Rest/RestSharpExtensions.cs b/src/NzbDrone.Core/Rest/RestSharpExtensions.cs
index b4b17510e..4f9c64e3b 100644
--- a/src/NzbDrone.Core/Rest/RestSharpExtensions.cs
+++ b/src/NzbDrone.Core/Rest/RestSharpExtensions.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Rest
             Ensure.That(response.Request, () => response.Request).IsNotNull();
             Ensure.That(restClient, () => restClient).IsNotNull();
 
-            Logger.Trace("Validating Responses from [{0}] [{1}] status: [{2}]", response.Request.Method, restClient.BuildUri(response.Request), response.StatusCode);
+            Logger.Debug("Validating Responses from [{0}] [{1}] status: [{2}]", response.Request.Method, restClient.BuildUri(response.Request), response.StatusCode);
 
             if (response.ResponseUri == null)
             {
diff --git a/src/NzbDrone.Core/Tv/EpisodeService.cs b/src/NzbDrone.Core/Tv/EpisodeService.cs
index f5a8f0c0e..402642e0a 100644
--- a/src/NzbDrone.Core/Tv/EpisodeService.cs
+++ b/src/NzbDrone.Core/Tv/EpisodeService.cs
@@ -191,7 +191,7 @@ namespace NzbDrone.Core.Tv
         {
             foreach (var episode in GetEpisodesByFileId(message.EpisodeFile.Id))
             {
-                _logger.Trace("Detaching episode {0} from file.", episode.Id);
+                _logger.Debug("Detaching episode {0} from file.", episode.Id);
                 episode.EpisodeFileId = 0;
 
                 if (!message.ForUpgrade && _configService.AutoUnmonitorPreviouslyDownloadedEpisodes)
diff --git a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs
index 8a1776642..b9c9a56cf 100644
--- a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs
+++ b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Core.DataAugmentation.DailySeries;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.MetadataSource;
@@ -88,7 +88,7 @@ namespace NzbDrone.Core.Tv
                 //Todo: Should this should use the previous season's monitored state?
                 if (existingSeason == null)
                 {
-                    _logger.Trace("New season ({0}) for series: [{1}] {2}, setting monitored to true", season.SeasonNumber, series.TvdbId, series.Title);
+                    _logger.Debug("New season ({0}) for series: [{1}] {2}, setting monitored to true", season.SeasonNumber, series.TvdbId, series.Title);
                     season.Monitored = true;
                 }
 
diff --git a/src/NzbDrone.Core/Tv/SeriesService.cs b/src/NzbDrone.Core/Tv/SeriesService.cs
index 9ddbb9428..b2cbf8ff6 100644
--- a/src/NzbDrone.Core/Tv/SeriesService.cs
+++ b/src/NzbDrone.Core/Tv/SeriesService.cs
@@ -141,10 +141,10 @@ namespace NzbDrone.Core.Tv
                 // series are usually the first thing in release title, so we select the leftmost and longest match
                 var match = query.First().series;
 
-                _logger.Trace("Multiple series matched {0} from title {1}", match.Title, title);
+                _logger.Debug("Multiple series matched {0} from title {1}", match.Title, title);
                 foreach (var entry in list)
                 {
-                    _logger.Trace("Multiple series match candidate: {0} cleantitle: {1}", entry.Title, entry.CleanTitle);
+                    _logger.Debug("Multiple series match candidate: {0} cleantitle: {1}", entry.Title, entry.CleanTitle);
                 }
 
                 return match;
@@ -202,8 +202,6 @@ namespace NzbDrone.Core.Tv
                     var folderName = new DirectoryInfo(s.Path).Name;
                     s.Path = Path.Combine(s.RootFolderPath, folderName);
                 }
-
-                _eventAggregator.PublishEvent(new SeriesEditedEvent(s));
             }
 
             _seriesRepository.UpdateMany(series);
diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs
index 1df980c20..da353fa33 100644
--- a/src/NzbDrone.Core/Update/InstallUpdateService.cs
+++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs
@@ -5,9 +5,9 @@ using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Processes;
+using NzbDrone.Core.Instrumentation.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Update.Commands;
-using NzbDrone.Core.Instrumentation;
 
 namespace NzbDrone.Core.Update
 {
diff --git a/src/NzbDrone.Core/Update/UpdateCheckService.cs b/src/NzbDrone.Core/Update/UpdateCheckService.cs
index 32cb64be2..57cd97905 100644
--- a/src/NzbDrone.Core/Update/UpdateCheckService.cs
+++ b/src/NzbDrone.Core/Update/UpdateCheckService.cs
@@ -1,7 +1,7 @@
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Instrumentation;
+using NzbDrone.Core.Instrumentation.Extensions;
 
 namespace NzbDrone.Core.Update
 {
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Update
 
         public UpdatePackage AvailableUpdate()
         {
-            if (OsInfo.IsLinux) return null;
+            if (OsInfo.IsMono) return null;
 
             var latestAvailable = _updatePackageProvider.GetLatestUpdate(_configFileProvider.Branch, BuildInfo.Version);
 
diff --git a/src/NzbDrone.Core/Update/UpdatePackageProvider.cs b/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
index e95d4c6fa..0b436adfb 100644
--- a/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
+++ b/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
@@ -22,6 +22,7 @@ namespace NzbDrone.Core.Update
             var request = new RestRequest("/v1/update/{branch}");
 
             request.AddParameter("version", currentVersion);
+            request.AddParameter("os", OsInfo.Os.ToString().ToLowerInvariant());
             request.AddUrlSegment("branch", branch);
 
             var update = restClient.ExecuteAndValidate<UpdatePackageAvailable>(request);
@@ -38,6 +39,7 @@ namespace NzbDrone.Core.Update
             var request = new RestRequest("/v1/update/{branch}/changes");
 
             request.AddParameter("majorVersion", BuildInfo.Version.Major);
+            request.AddParameter("os", OsInfo.Os.ToString().ToLowerInvariant());
             request.AddUrlSegment("branch", branch);
 
             var updates = restClient.ExecuteAndValidate<List<UpdatePackage>>(request);
diff --git a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
index c252e3e9e..67aa04edd 100644
--- a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
+++ b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
@@ -30,13 +30,13 @@ namespace NzbDrone.Host.AccessControl
             {
                 if (!IsNzbDronePortOpen(_configFileProvider.Port))
                 {
-                    _logger.Trace("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
+                    _logger.Debug("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
                     OpenFirewallPort(_configFileProvider.Port);
                 }
 
                 if (_configFileProvider.EnableSsl && !IsNzbDronePortOpen(_configFileProvider.SslPort))
                 {
-                    _logger.Trace("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
+                    _logger.Debug("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
                     OpenFirewallPort(_configFileProvider.SslPort);
                 }
             }
@@ -90,7 +90,7 @@ namespace NzbDrone.Host.AccessControl
 
         private bool IsFirewallEnabled()
         {
-            if (OsInfo.IsLinux) return false;
+            if (OsInfo.IsMono) return false;
 
             try
             {
diff --git a/src/NzbDrone.Host/ApplicationServer.cs b/src/NzbDrone.Host/ApplicationServer.cs
index 946334ec6..c299c4870 100644
--- a/src/NzbDrone.Host/ApplicationServer.cs
+++ b/src/NzbDrone.Host/ApplicationServer.cs
@@ -53,9 +53,9 @@ namespace NzbDrone.Host
 
         public void Start()
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
-                Console.CancelKeyPress += (sender, eventArgs) => _processProvider.Kill(_processProvider.GetCurrentProcess().Id);
+                Console.CancelKeyPress += (sender, eventArgs) => LogManager.Configuration = null;
             }
 
             _runtimeInfo.IsRunning = true;
@@ -90,13 +90,14 @@ namespace NzbDrone.Host
 
         public void Handle(ApplicationShutdownRequested message)
         {
-            if (OsInfo.IsLinux)
+            if (!_runtimeInfo.IsWindowsService)
             {
-                _processProvider.Kill(_processProvider.GetCurrentProcess().Id);
-            }
+                if (message.Restarting)
+                {
+                    _runtimeInfo.RestartPending = true;
+                }
 
-            if (!_runtimeInfo.IsWindowsService && !message.Restarting)
-            {
+                LogManager.Configuration = null;
                 Shutdown();
             }
         }
diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
index 1b0d9fa70..ca277851c 100644
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -5,6 +5,7 @@ using NLog;
 using NzbDrone.Common.Composition;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
+using NzbDrone.Common.Processes;
 using NzbDrone.Common.Security;
 using NzbDrone.Core.Datastore;
 
@@ -24,7 +25,7 @@ namespace NzbDrone.Host
                 GlobalExceptionHandlers.Register();
                 IgnoreCertErrorPolicy.Register();
 
-                Logger.Info("Starting NzbDrone Console. Version {0}", Assembly.GetExecutingAssembly().GetName().Version);
+                Logger.Info("Starting NzbDrone - {0} - Version {1}", Assembly.GetCallingAssembly().Location, Assembly.GetExecutingAssembly().GetName().Version);
 
                 if (!PlatformValidation.IsValidate(userAlert))
                 {
@@ -59,6 +60,11 @@ namespace NzbDrone.Host
         {
             if (!IsInUtilityMode(applicationModes))
             {
+                if (startupContext.Flags.Contains(StartupContext.RESTART))
+                {
+                    Thread.Sleep(2000);
+                }
+
                 EnsureSingleInstance(applicationModes == ApplicationModes.Service, startupContext);
             }
 
@@ -73,12 +79,7 @@ namespace NzbDrone.Host
                 return;
             }
 
-            var runTimeInfo = _container.Resolve<IRuntimeInfo>();
-
-            while (runTimeInfo.IsRunning)
-            {
-                Thread.Sleep(1000);
-            }
+            _container.Resolve<IWaitForExit>().Spin();
         }
 
         private static void EnsureSingleInstance(bool isService, StartupContext startupContext)
@@ -106,12 +107,12 @@ namespace NzbDrone.Host
                 return ApplicationModes.Help;
             }
 
-            if (!OsInfo.IsLinux && startupContext.InstallService)
+            if (!OsInfo.IsMono && startupContext.InstallService)
             {
                 return ApplicationModes.InstallService;
             }
 
-            if (!OsInfo.IsLinux && startupContext.UninstallService)
+            if (!OsInfo.IsMono && startupContext.UninstallService)
             {
                 return ApplicationModes.UninstallService;
             }
diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj
index 703828a2f..861ae81e9 100644
--- a/src/NzbDrone.Host/NzbDrone.Host.csproj
+++ b/src/NzbDrone.Host/NzbDrone.Host.csproj
@@ -101,6 +101,7 @@
     <Compile Include="AccessControl\FirewallAdapter.cs" />
     <Compile Include="AccessControl\UrlAclAdapter.cs" />
     <Compile Include="BrowserService.cs" />
+    <Compile Include="SpinService.cs" />
     <Compile Include="SingleInstancePolicy.cs" />
     <Compile Include="IUserAlert.cs" />
     <Compile Include="Owin\NlogTextWriter.cs" />
diff --git a/src/NzbDrone.Host/Owin/NlogTextWriter.cs b/src/NzbDrone.Host/Owin/NlogTextWriter.cs
index 1bb580b91..cc1ba4627 100644
--- a/src/NzbDrone.Host/Owin/NlogTextWriter.cs
+++ b/src/NzbDrone.Host/Owin/NlogTextWriter.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Host.Owin
 
         public override void Write(string value)
         {
-            if (value.ToLower().Contains("error") && !value.ToLower().Contains("sqlite"))
+            if (value.ToLower().Contains("error") && !(value.ToLower().Contains("sqlite") || value.ToLower().Contains("\"errors\":null")))
             {
                 _logger.Error(value);
             }
diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs
index 900a3a062..72d1c8f67 100644
--- a/src/NzbDrone.Host/Router.cs
+++ b/src/NzbDrone.Host/Router.cs
@@ -27,20 +27,20 @@ namespace NzbDrone.Host
             {
                 case ApplicationModes.Service:
                     {
-                        _logger.Trace("Service selected");
+                        _logger.Debug("Service selected");
                         _serviceProvider.Run(_nzbDroneServiceFactory.Build());
                         break;
                     }
 
                 case ApplicationModes.Interactive:
                     {
-                        _logger.Trace("Console selected");
+                        _logger.Debug("Console selected");
                         _nzbDroneServiceFactory.Start();
                         break;
                     }
                 case ApplicationModes.InstallService:
                     {
-                        _logger.Trace("Install Service selected");
+                        _logger.Debug("Install Service selected");
                         if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME))
                         {
                             _consoleService.PrintServiceAlreadyExist();
@@ -54,7 +54,7 @@ namespace NzbDrone.Host
                     }
                 case ApplicationModes.UninstallService:
                     {
-                        _logger.Trace("Uninstall Service selected");
+                        _logger.Debug("Uninstall Service selected");
                         if (!_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME))
                         {
                             _consoleService.PrintServiceDoesNotExist();
diff --git a/src/NzbDrone.Host/SpinService.cs b/src/NzbDrone.Host/SpinService.cs
new file mode 100644
index 000000000..8b07dfbc2
--- /dev/null
+++ b/src/NzbDrone.Host/SpinService.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
+
+namespace NzbDrone.Host
+{
+    public interface IWaitForExit
+    {
+        void Spin();
+    }
+
+    public class SpinService : IWaitForExit
+    {
+        private readonly IRuntimeInfo _runtimeInfo;
+        private readonly IProcessProvider _processProvider;
+
+        public SpinService(IRuntimeInfo runtimeInfo, IProcessProvider processProvider)
+        {
+            _runtimeInfo = runtimeInfo;
+            _processProvider = processProvider;
+        }
+
+        public void Spin()
+        {
+            while (_runtimeInfo.IsRunning)
+            {
+                Thread.Sleep(1000);
+            }
+
+            if (_runtimeInfo.RestartPending)
+            {
+                _processProvider.SpawnNewProcess(_runtimeInfo.ExecutingApplication, "--restart --nobrowser");
+            }
+        }
+    }
+}
diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
index aac55c5df..dffd16153 100644
--- a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
+++ b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Mono.Test.DiskProviderTests
     {
         public DiskProviderFixture()
         {
-            LinuxOnly();
+            MonoOnly();
         }
     }
 }
diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
index 247a0801d..109fb4825 100644
--- a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
+++ b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Mono.Test.DiskProviderTests
     {
         public FreeSpaceFixture()
         {
-            LinuxOnly();
+            MonoOnly();
         }
     }
 }
diff --git a/src/NzbDrone.Mono/DiskProvider.cs b/src/NzbDrone.Mono/DiskProvider.cs
index 3a2d2e8b2..2038d44c5 100644
--- a/src/NzbDrone.Mono/DiskProvider.cs
+++ b/src/NzbDrone.Mono/DiskProvider.cs
@@ -28,7 +28,7 @@ namespace NzbDrone.Mono
 
                 if (driveInfo == null)
                 {
-                    Logger.Trace("Unable to get free space for '{0}', unable to find suitable drive", path);
+                    Logger.Debug("Unable to get free space for '{0}', unable to find suitable drive", path);
                     return null;
                 }
 
@@ -59,7 +59,7 @@ namespace NzbDrone.Mono
 
         public override void SetPermissions(string path, string mask, string user, string group)
         {
-            Logger.Trace("Setting permissions: {0} on {1}", mask, path);
+            Logger.Debug("Setting permissions: {0} on {1}", mask, path);
 
             var filePermissions = NativeConvert.FromOctalPermissionString(mask);
 
@@ -72,7 +72,7 @@ namespace NzbDrone.Mono
 
             if (String.IsNullOrWhiteSpace(user) || String.IsNullOrWhiteSpace(group))
             {
-                Logger.Trace("User or Group for chown not configured, skipping chown.");
+                Logger.Debug("User or Group for chown not configured, skipping chown.");
                 return;
             }
 
@@ -93,7 +93,7 @@ namespace NzbDrone.Mono
 
             if (!uint.TryParse(group, out groupId))
             {
-                var g = Syscall.getgrnam(user);
+                var g = Syscall.getgrnam(group);
 
                 if (g == null)
                 {
@@ -107,7 +107,7 @@ namespace NzbDrone.Mono
             {
                 var error = Stdlib.GetLastError();
 
-                throw new LinuxPermissionsException("Error setting file owner: " + error);
+                throw new LinuxPermissionsException("Error setting file owner and/or group: " + error);
             }
         }
 
diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
index 2c7e4b4f7..437a9bde4 100644
--- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
+++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs
@@ -173,7 +173,7 @@ namespace NzbDrone.Test.Common.AutoMoq
         {
             var assemblyName = "NzbDrone.Windows";
 
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 assemblyName = "NzbDrone.Mono";
             }
diff --git a/src/NzbDrone.Test.Common/StringExtensions.cs b/src/NzbDrone.Test.Common/StringExtensions.cs
index 7ec3f4698..09b9b5b2d 100644
--- a/src/NzbDrone.Test.Common/StringExtensions.cs
+++ b/src/NzbDrone.Test.Common/StringExtensions.cs
@@ -7,7 +7,7 @@ namespace NzbDrone.Test.Common
     {
         public static string AsOsAgnostic(this string path)
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 if (path.Length > 2 && path[1] == ':')
                 {
diff --git a/src/NzbDrone.Test.Common/TestBase.cs b/src/NzbDrone.Test.Common/TestBase.cs
index 470cba8e1..5809a8816 100644
--- a/src/NzbDrone.Test.Common/TestBase.cs
+++ b/src/NzbDrone.Test.Common/TestBase.cs
@@ -124,16 +124,16 @@ namespace NzbDrone.Test.Common
 
         protected void WindowsOnly()
         {
-            if (OsInfo.IsLinux)
+            if (OsInfo.IsMono)
             {
                 throw new IgnoreException("windows specific test");
             }
         }
 
 
-        protected void LinuxOnly()
+        protected void MonoOnly()
         {
-            if (!OsInfo.IsLinux)
+            if (!OsInfo.IsMono)
             {
                 throw new IgnoreException("linux specific test");
             }
diff --git a/src/UI/.idea/jsLibraryMappings.xml b/src/UI/.idea/jsLibraryMappings.xml
index f6e673adc..62c621f94 100644
--- a/src/UI/.idea/jsLibraryMappings.xml
+++ b/src/UI/.idea/jsLibraryMappings.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4" />
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <excludedPredefinedLibrary name="HTML" />
+    <excludedPredefinedLibrary name="HTML5 / EcmaScript 5" />
+  </component>
+</project>
 
diff --git a/src/UI/Commands/CommandMessengerItemView.js b/src/UI/Commands/CommandMessengerItemView.js
index d772943be..cc6d8a3f4 100644
--- a/src/UI/Commands/CommandMessengerItemView.js
+++ b/src/UI/Commands/CommandMessengerItemView.js
@@ -7,12 +7,10 @@ define(
 
         return Marionette.ItemView.extend({
 
-
             initialize: function () {
                 this.listenTo(this.model, 'change', this.render);
             },
 
-
             render: function () {
                 if (!this.model.get('message') || !this.model.get('sendUpdatesToClient')) {
                     return;
@@ -37,7 +35,13 @@ define(
                         message.hideAfter = 0;
                 }
 
-                Messenger.show(message);
+                if (this.messenger) {
+                    this.messenger.update(message);
+                }
+
+                else {
+                    this.messenger = Messenger.show(message);
+                }
 
                 console.log(message.message);
             }
diff --git a/src/UI/Content/Backgrid/paginator.less b/src/UI/Content/Backgrid/paginator.less
index 29f36b4ff..929dabd99 100644
--- a/src/UI/Content/Backgrid/paginator.less
+++ b/src/UI/Content/Backgrid/paginator.less
@@ -34,6 +34,10 @@
         text-decoration : none;
       }
 
+      select {
+        width: auto;
+      }
+
       .pager-btn {
         .clickable;
       }
diff --git a/src/UI/Content/form.less b/src/UI/Content/form.less
index a4c5aaf9e..d19884933 100644
--- a/src/UI/Content/form.less
+++ b/src/UI/Content/form.less
@@ -7,6 +7,7 @@
       color        : #595959;
       margin-right : 5px;
     }
+
     .checkbox {
       width         : 100px;
       margin-left   : 0px;
@@ -24,7 +25,8 @@
 
     .btn {
       i {
-        margin-right: 0px;
+        margin-right : 0px;
+        color        : inherit;
       }
     }
   }
diff --git a/src/UI/Content/zero.clipboard.swf b/src/UI/Content/zero.clipboard.swf
new file mode 100644
index 000000000..ed962a56d
Binary files /dev/null and b/src/UI/Content/zero.clipboard.swf differ
diff --git a/src/UI/Handlebars/Helpers/Enumerable.js b/src/UI/Handlebars/Helpers/Enumerable.js
new file mode 100644
index 000000000..6df9d82d5
--- /dev/null
+++ b/src/UI/Handlebars/Helpers/Enumerable.js
@@ -0,0 +1,25 @@
+'use strict';
+define(
+    [
+        'handlebars'
+    ], function (Handlebars) {
+        Handlebars.registerHelper('times', function(n, block) {
+            var accum = '';
+
+            for(var i = 0; i < n; ++i) {
+                accum += block.fn(i);
+            }
+
+            return accum;
+        });
+
+        Handlebars.registerHelper('for', function(from, to, incr, block) {
+            var accum = '';
+
+            for(var i = from; i < to; i += incr) {
+                accum += block.fn(i);
+            }
+
+            return accum;
+        });
+    });
diff --git a/src/UI/Handlebars/Helpers/System.js b/src/UI/Handlebars/Helpers/System.js
index 13cead2f7..899572096 100644
--- a/src/UI/Handlebars/Helpers/System.js
+++ b/src/UI/Handlebars/Helpers/System.js
@@ -15,8 +15,8 @@ define(
             return options.inverse(this);
         });
 
-        Handlebars.registerHelper('if_linux', function(options) {
-            if (StatusModel.get('isLinux'))
+        Handlebars.registerHelper('if_mono', function(options) {
+            if (StatusModel.get('isMono'))
             {
                 return options.fn(this);
             }
diff --git a/src/UI/Handlebars/backbone.marionette.templates.js b/src/UI/Handlebars/backbone.marionette.templates.js
index 6b0ed8ac5..8778df684 100644
--- a/src/UI/Handlebars/backbone.marionette.templates.js
+++ b/src/UI/Handlebars/backbone.marionette.templates.js
@@ -11,6 +11,7 @@ define(
         'Handlebars/Helpers/Quality',
         'Handlebars/Helpers/System',
         'Handlebars/Helpers/EachReverse',
+        'Handlebars/Helpers/EachReverse',
         'Handlebars/Handlebars.Debug'
     ], function (Templates) {
         return function () {
diff --git a/src/UI/JsLibraries/zero.clipboard.js b/src/UI/JsLibraries/zero.clipboard.js
new file mode 100644
index 000000000..7706edcf5
--- /dev/null
+++ b/src/UI/JsLibraries/zero.clipboard.js
@@ -0,0 +1,1010 @@
+/*!
+* ZeroClipboard
+* The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface.
+* Copyright (c) 2014 Jon Rohan, James M. Greene
+* Licensed MIT
+* http://zeroclipboard.org/
+* v1.3.2
+*/
+(function() {
+  "use strict";
+  var currentElement;
+  var flashState = {
+    bridge: null,
+    version: "0.0.0",
+    disabled: null,
+    outdated: null,
+    ready: null
+  };
+  var _clipData = {};
+  var clientIdCounter = 0;
+  var _clientMeta = {};
+  var elementIdCounter = 0;
+  var _elementMeta = {};
+  var _amdModuleId = null;
+  var _cjsModuleId = null;
+  var _swfPath = function() {
+    var i, jsDir, tmpJsPath, jsPath, swfPath = "ZeroClipboard.swf";
+    if (document.currentScript && (jsPath = document.currentScript.src)) {} else {
+      var scripts = document.getElementsByTagName("script");
+      if ("readyState" in scripts[0]) {
+        for (i = scripts.length; i--; ) {
+          if (scripts[i].readyState === "interactive" && (jsPath = scripts[i].src)) {
+            break;
+          }
+        }
+      } else if (document.readyState === "loading") {
+        jsPath = scripts[scripts.length - 1].src;
+      } else {
+        for (i = scripts.length; i--; ) {
+          tmpJsPath = scripts[i].src;
+          if (!tmpJsPath) {
+            jsDir = null;
+            break;
+          }
+          tmpJsPath = tmpJsPath.split("#")[0].split("?")[0];
+          tmpJsPath = tmpJsPath.slice(0, tmpJsPath.lastIndexOf("/") + 1);
+          if (jsDir == null) {
+            jsDir = tmpJsPath;
+          } else if (jsDir !== tmpJsPath) {
+            jsDir = null;
+            break;
+          }
+        }
+        if (jsDir !== null) {
+          jsPath = jsDir;
+        }
+      }
+    }
+    if (jsPath) {
+      jsPath = jsPath.split("#")[0].split("?")[0];
+      swfPath = jsPath.slice(0, jsPath.lastIndexOf("/") + 1) + swfPath;
+    }
+    return swfPath;
+  }();
+  var _camelizeCssPropName = function() {
+    var matcherRegex = /\-([a-z])/g, replacerFn = function(match, group) {
+      return group.toUpperCase();
+    };
+    return function(prop) {
+      return prop.replace(matcherRegex, replacerFn);
+    };
+  }();
+  var _getStyle = function(el, prop) {
+    var value, camelProp, tagName, possiblePointers, i, len;
+    if (window.getComputedStyle) {
+      value = window.getComputedStyle(el, null).getPropertyValue(prop);
+    } else {
+      camelProp = _camelizeCssPropName(prop);
+      if (el.currentStyle) {
+        value = el.currentStyle[camelProp];
+      } else {
+        value = el.style[camelProp];
+      }
+    }
+    if (prop === "cursor") {
+      if (!value || value === "auto") {
+        tagName = el.tagName.toLowerCase();
+        if (tagName === "a") {
+          return "pointer";
+        }
+      }
+    }
+    return value;
+  };
+  var _elementMouseOver = function(event) {
+    if (!event) {
+      event = window.event;
+    }
+    var target;
+    if (this !== window) {
+      target = this;
+    } else if (event.target) {
+      target = event.target;
+    } else if (event.srcElement) {
+      target = event.srcElement;
+    }
+    ZeroClipboard.activate(target);
+  };
+  var _addEventHandler = function(element, method, func) {
+    if (!element || element.nodeType !== 1) {
+      return;
+    }
+    if (element.addEventListener) {
+      element.addEventListener(method, func, false);
+    } else if (element.attachEvent) {
+      element.attachEvent("on" + method, func);
+    }
+  };
+  var _removeEventHandler = function(element, method, func) {
+    if (!element || element.nodeType !== 1) {
+      return;
+    }
+    if (element.removeEventListener) {
+      element.removeEventListener(method, func, false);
+    } else if (element.detachEvent) {
+      element.detachEvent("on" + method, func);
+    }
+  };
+  var _addClass = function(element, value) {
+    if (!element || element.nodeType !== 1) {
+      return element;
+    }
+    if (element.classList) {
+      if (!element.classList.contains(value)) {
+        element.classList.add(value);
+      }
+      return element;
+    }
+    if (value && typeof value === "string") {
+      var classNames = (value || "").split(/\s+/);
+      if (element.nodeType === 1) {
+        if (!element.className) {
+          element.className = value;
+        } else {
+          var className = " " + element.className + " ", setClass = element.className;
+          for (var c = 0, cl = classNames.length; c < cl; c++) {
+            if (className.indexOf(" " + classNames[c] + " ") < 0) {
+              setClass += " " + classNames[c];
+            }
+          }
+          element.className = setClass.replace(/^\s+|\s+$/g, "");
+        }
+      }
+    }
+    return element;
+  };
+  var _removeClass = function(element, value) {
+    if (!element || element.nodeType !== 1) {
+      return element;
+    }
+    if (element.classList) {
+      if (element.classList.contains(value)) {
+        element.classList.remove(value);
+      }
+      return element;
+    }
+    if (value && typeof value === "string" || value === undefined) {
+      var classNames = (value || "").split(/\s+/);
+      if (element.nodeType === 1 && element.className) {
+        if (value) {
+          var className = (" " + element.className + " ").replace(/[\n\t]/g, " ");
+          for (var c = 0, cl = classNames.length; c < cl; c++) {
+            className = className.replace(" " + classNames[c] + " ", " ");
+          }
+          element.className = className.replace(/^\s+|\s+$/g, "");
+        } else {
+          element.className = "";
+        }
+      }
+    }
+    return element;
+  };
+  var _getZoomFactor = function() {
+    var rect, physicalWidth, logicalWidth, zoomFactor = 1;
+    if (typeof document.body.getBoundingClientRect === "function") {
+      rect = document.body.getBoundingClientRect();
+      physicalWidth = rect.right - rect.left;
+      logicalWidth = document.body.offsetWidth;
+      zoomFactor = Math.round(physicalWidth / logicalWidth * 100) / 100;
+    }
+    return zoomFactor;
+  };
+  var _getDOMObjectPosition = function(obj, defaultZIndex) {
+    var info = {
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
+      zIndex: _getSafeZIndex(defaultZIndex) - 1
+    };
+    if (obj.getBoundingClientRect) {
+      var rect = obj.getBoundingClientRect();
+      var pageXOffset, pageYOffset, zoomFactor;
+      if ("pageXOffset" in window && "pageYOffset" in window) {
+        pageXOffset = window.pageXOffset;
+        pageYOffset = window.pageYOffset;
+      } else {
+        zoomFactor = _getZoomFactor();
+        pageXOffset = Math.round(document.documentElement.scrollLeft / zoomFactor);
+        pageYOffset = Math.round(document.documentElement.scrollTop / zoomFactor);
+      }
+      var leftBorderWidth = document.documentElement.clientLeft || 0;
+      var topBorderWidth = document.documentElement.clientTop || 0;
+      info.left = rect.left + pageXOffset - leftBorderWidth;
+      info.top = rect.top + pageYOffset - topBorderWidth;
+      info.width = "width" in rect ? rect.width : rect.right - rect.left;
+      info.height = "height" in rect ? rect.height : rect.bottom - rect.top;
+    }
+    return info;
+  };
+  var _cacheBust = function(path, options) {
+    var cacheBust = options == null || options && options.cacheBust === true && options.useNoCache === true;
+    if (cacheBust) {
+      return (path.indexOf("?") === -1 ? "?" : "&") + "noCache=" + new Date().getTime();
+    } else {
+      return "";
+    }
+  };
+  var _vars = function(options) {
+    var i, len, domain, str = [], domains = [], trustedOriginsExpanded = [];
+    if (options.trustedOrigins) {
+      if (typeof options.trustedOrigins === "string") {
+        domains.push(options.trustedOrigins);
+      } else if (typeof options.trustedOrigins === "object" && "length" in options.trustedOrigins) {
+        domains = domains.concat(options.trustedOrigins);
+      }
+    }
+    if (options.trustedDomains) {
+      if (typeof options.trustedDomains === "string") {
+        domains.push(options.trustedDomains);
+      } else if (typeof options.trustedDomains === "object" && "length" in options.trustedDomains) {
+        domains = domains.concat(options.trustedDomains);
+      }
+    }
+    if (domains.length) {
+      for (i = 0, len = domains.length; i < len; i++) {
+        if (domains.hasOwnProperty(i) && domains[i] && typeof domains[i] === "string") {
+          domain = _extractDomain(domains[i]);
+          if (!domain) {
+            continue;
+          }
+          if (domain === "*") {
+            trustedOriginsExpanded = [ domain ];
+            break;
+          }
+          trustedOriginsExpanded.push.apply(trustedOriginsExpanded, [ domain, "//" + domain, window.location.protocol + "//" + domain ]);
+        }
+      }
+    }
+    if (trustedOriginsExpanded.length) {
+      str.push("trustedOrigins=" + encodeURIComponent(trustedOriginsExpanded.join(",")));
+    }
+    if (typeof options.jsModuleId === "string" && options.jsModuleId) {
+      str.push("jsModuleId=" + encodeURIComponent(options.jsModuleId));
+    }
+    return str.join("&");
+  };
+  var _inArray = function(elem, array, fromIndex) {
+    if (typeof array.indexOf === "function") {
+      return array.indexOf(elem, fromIndex);
+    }
+    var i, len = array.length;
+    if (typeof fromIndex === "undefined") {
+      fromIndex = 0;
+    } else if (fromIndex < 0) {
+      fromIndex = len + fromIndex;
+    }
+    for (i = fromIndex; i < len; i++) {
+      if (array.hasOwnProperty(i) && array[i] === elem) {
+        return i;
+      }
+    }
+    return -1;
+  };
+  var _prepClip = function(elements) {
+    if (typeof elements === "string") throw new TypeError("ZeroClipboard doesn't accept query strings.");
+    if (!elements.length) return [ elements ];
+    return elements;
+  };
+  var _dispatchCallback = function(func, context, args, async) {
+    if (async) {
+      window.setTimeout(function() {
+        func.apply(context, args);
+      }, 0);
+    } else {
+      func.apply(context, args);
+    }
+  };
+  var _getSafeZIndex = function(val) {
+    var zIndex, tmp;
+    if (val) {
+      if (typeof val === "number" && val > 0) {
+        zIndex = val;
+      } else if (typeof val === "string" && (tmp = parseInt(val, 10)) && !isNaN(tmp) && tmp > 0) {
+        zIndex = tmp;
+      }
+    }
+    if (!zIndex) {
+      if (typeof _globalConfig.zIndex === "number" && _globalConfig.zIndex > 0) {
+        zIndex = _globalConfig.zIndex;
+      } else if (typeof _globalConfig.zIndex === "string" && (tmp = parseInt(_globalConfig.zIndex, 10)) && !isNaN(tmp) && tmp > 0) {
+        zIndex = tmp;
+      }
+    }
+    return zIndex || 0;
+  };
+  var _deprecationWarning = function(deprecatedApiName, debugEnabled) {
+    if (deprecatedApiName && debugEnabled !== false && typeof console !== "undefined" && console && (console.warn || console.log)) {
+      var deprecationWarning = "`" + deprecatedApiName + "` is deprecated. See docs for more info:\n" + "    https://github.com/zeroclipboard/zeroclipboard/blob/master/docs/instructions.md#deprecations";
+      if (console.warn) {
+        console.warn(deprecationWarning);
+      } else {
+        console.log(deprecationWarning);
+      }
+    }
+  };
+  var _extend = function() {
+    var i, len, arg, prop, src, copy, target = arguments[0] || {};
+    for (i = 1, len = arguments.length; i < len; i++) {
+      if ((arg = arguments[i]) != null) {
+        for (prop in arg) {
+          if (arg.hasOwnProperty(prop)) {
+            src = target[prop];
+            copy = arg[prop];
+            if (target === copy) {
+              continue;
+            }
+            if (copy !== undefined) {
+              target[prop] = copy;
+            }
+          }
+        }
+      }
+    }
+    return target;
+  };
+  var _extractDomain = function(originOrUrl) {
+    if (originOrUrl == null || originOrUrl === "") {
+      return null;
+    }
+    originOrUrl = originOrUrl.replace(/^\s+|\s+$/g, "");
+    if (originOrUrl === "") {
+      return null;
+    }
+    var protocolIndex = originOrUrl.indexOf("//");
+    originOrUrl = protocolIndex === -1 ? originOrUrl : originOrUrl.slice(protocolIndex + 2);
+    var pathIndex = originOrUrl.indexOf("/");
+    originOrUrl = pathIndex === -1 ? originOrUrl : protocolIndex === -1 || pathIndex === 0 ? null : originOrUrl.slice(0, pathIndex);
+    if (originOrUrl && originOrUrl.slice(-4).toLowerCase() === ".swf") {
+      return null;
+    }
+    return originOrUrl || null;
+  };
+  var _determineScriptAccess = function() {
+    var _extractAllDomains = function(origins, resultsArray) {
+      var i, len, tmp;
+      if (origins != null && resultsArray[0] !== "*") {
+        if (typeof origins === "string") {
+          origins = [ origins ];
+        }
+        if (typeof origins === "object" && "length" in origins) {
+          for (i = 0, len = origins.length; i < len; i++) {
+            if (origins.hasOwnProperty(i)) {
+              tmp = _extractDomain(origins[i]);
+              if (tmp) {
+                if (tmp === "*") {
+                  resultsArray.length = 0;
+                  resultsArray.push("*");
+                  break;
+                }
+                if (_inArray(tmp, resultsArray) === -1) {
+                  resultsArray.push(tmp);
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+    var _accessLevelLookup = {
+      always: "always",
+      samedomain: "sameDomain",
+      never: "never"
+    };
+    return function(currentDomain, configOptions) {
+      var asaLower, allowScriptAccess = configOptions.allowScriptAccess;
+      if (typeof allowScriptAccess === "string" && (asaLower = allowScriptAccess.toLowerCase()) && /^always|samedomain|never$/.test(asaLower)) {
+        return _accessLevelLookup[asaLower];
+      }
+      var swfDomain = _extractDomain(configOptions.moviePath);
+      if (swfDomain === null) {
+        swfDomain = currentDomain;
+      }
+      var trustedDomains = [];
+      _extractAllDomains(configOptions.trustedOrigins, trustedDomains);
+      _extractAllDomains(configOptions.trustedDomains, trustedDomains);
+      var len = trustedDomains.length;
+      if (len > 0) {
+        if (len === 1 && trustedDomains[0] === "*") {
+          return "always";
+        }
+        if (_inArray(currentDomain, trustedDomains) !== -1) {
+          if (len === 1 && currentDomain === swfDomain) {
+            return "sameDomain";
+          }
+          return "always";
+        }
+      }
+      return "never";
+    };
+  }();
+  var _objectKeys = function(obj) {
+    if (obj == null) {
+      return [];
+    }
+    if (Object.keys) {
+      return Object.keys(obj);
+    }
+    var keys = [];
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        keys.push(prop);
+      }
+    }
+    return keys;
+  };
+  var _deleteOwnProperties = function(obj) {
+    if (obj) {
+      for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) {
+          delete obj[prop];
+        }
+      }
+    }
+    return obj;
+  };
+  var _detectFlashSupport = function() {
+    var hasFlash = false;
+    if (typeof flashState.disabled === "boolean") {
+      hasFlash = flashState.disabled === false;
+    } else {
+      if (typeof ActiveXObject === "function") {
+        try {
+          if (new ActiveXObject("ShockwaveFlash.ShockwaveFlash")) {
+            hasFlash = true;
+          }
+        } catch (error) {}
+      }
+      if (!hasFlash && navigator.mimeTypes["application/x-shockwave-flash"]) {
+        hasFlash = true;
+      }
+    }
+    return hasFlash;
+  };
+  function _parseFlashVersion(flashVersion) {
+    return flashVersion.replace(/,/g, ".").replace(/[^0-9\.]/g, "");
+  }
+  function _isFlashVersionSupported(flashVersion) {
+    return parseFloat(_parseFlashVersion(flashVersion)) >= 10;
+  }
+  var ZeroClipboard = function(elements, options) {
+    if (!(this instanceof ZeroClipboard)) {
+      return new ZeroClipboard(elements, options);
+    }
+    this.id = "" + clientIdCounter++;
+    _clientMeta[this.id] = {
+      instance: this,
+      elements: [],
+      handlers: {}
+    };
+    if (elements) {
+      this.clip(elements);
+    }
+    if (typeof options !== "undefined") {
+      _deprecationWarning("new ZeroClipboard(elements, options)", _globalConfig.debug);
+      ZeroClipboard.config(options);
+    }
+    this.options = ZeroClipboard.config();
+    if (typeof flashState.disabled !== "boolean") {
+      flashState.disabled = !_detectFlashSupport();
+    }
+    if (flashState.disabled === false && flashState.outdated !== true) {
+      if (flashState.bridge === null) {
+        flashState.outdated = false;
+        flashState.ready = false;
+        _bridge();
+      }
+    }
+  };
+  ZeroClipboard.prototype.setText = function(newText) {
+    if (newText && newText !== "") {
+      _clipData["text/plain"] = newText;
+      if (flashState.ready === true && flashState.bridge) {
+        flashState.bridge.setText(newText);
+      } else {}
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.setSize = function(width, height) {
+    if (flashState.ready === true && flashState.bridge) {
+      flashState.bridge.setSize(width, height);
+    } else {}
+    return this;
+  };
+  var _setHandCursor = function(enabled) {
+    if (flashState.ready === true && flashState.bridge) {
+      flashState.bridge.setHandCursor(enabled);
+    } else {}
+  };
+  ZeroClipboard.prototype.destroy = function() {
+    this.unclip();
+    this.off();
+    delete _clientMeta[this.id];
+  };
+  var _getAllClients = function() {
+    var i, len, client, clients = [], clientIds = _objectKeys(_clientMeta);
+    for (i = 0, len = clientIds.length; i < len; i++) {
+      client = _clientMeta[clientIds[i]].instance;
+      if (client && client instanceof ZeroClipboard) {
+        clients.push(client);
+      }
+    }
+    return clients;
+  };
+  ZeroClipboard.version = "1.3.2";
+  var _globalConfig = {
+    swfPath: _swfPath,
+    trustedDomains: window.location.host ? [ window.location.host ] : [],
+    cacheBust: true,
+    forceHandCursor: false,
+    zIndex: 999999999,
+    debug: true,
+    title: null,
+    autoActivate: true
+  };
+  ZeroClipboard.config = function(options) {
+    if (typeof options === "object" && options !== null) {
+      _extend(_globalConfig, options);
+    }
+    if (typeof options === "string" && options) {
+      if (_globalConfig.hasOwnProperty(options)) {
+        return _globalConfig[options];
+      }
+      return;
+    }
+    var copy = {};
+    for (var prop in _globalConfig) {
+      if (_globalConfig.hasOwnProperty(prop)) {
+        if (typeof _globalConfig[prop] === "object" && _globalConfig[prop] !== null) {
+          if ("length" in _globalConfig[prop]) {
+            copy[prop] = _globalConfig[prop].slice(0);
+          } else {
+            copy[prop] = _extend({}, _globalConfig[prop]);
+          }
+        } else {
+          copy[prop] = _globalConfig[prop];
+        }
+      }
+    }
+    return copy;
+  };
+  ZeroClipboard.destroy = function() {
+    ZeroClipboard.deactivate();
+    for (var clientId in _clientMeta) {
+      if (_clientMeta.hasOwnProperty(clientId) && _clientMeta[clientId]) {
+        var client = _clientMeta[clientId].instance;
+        if (client && typeof client.destroy === "function") {
+          client.destroy();
+        }
+      }
+    }
+    var htmlBridge = _getHtmlBridge(flashState.bridge);
+    if (htmlBridge && htmlBridge.parentNode) {
+      htmlBridge.parentNode.removeChild(htmlBridge);
+      flashState.ready = null;
+      flashState.bridge = null;
+    }
+  };
+  ZeroClipboard.activate = function(element) {
+    if (currentElement) {
+      _removeClass(currentElement, _globalConfig.hoverClass);
+      _removeClass(currentElement, _globalConfig.activeClass);
+    }
+    currentElement = element;
+    _addClass(element, _globalConfig.hoverClass);
+    _reposition();
+    var newTitle = _globalConfig.title || element.getAttribute("title");
+    if (newTitle) {
+      var htmlBridge = _getHtmlBridge(flashState.bridge);
+      if (htmlBridge) {
+        htmlBridge.setAttribute("title", newTitle);
+      }
+    }
+    var useHandCursor = _globalConfig.forceHandCursor === true || _getStyle(element, "cursor") === "pointer";
+    _setHandCursor(useHandCursor);
+  };
+  ZeroClipboard.deactivate = function() {
+    var htmlBridge = _getHtmlBridge(flashState.bridge);
+    if (htmlBridge) {
+      htmlBridge.style.left = "0px";
+      htmlBridge.style.top = "-9999px";
+      htmlBridge.removeAttribute("title");
+    }
+    if (currentElement) {
+      _removeClass(currentElement, _globalConfig.hoverClass);
+      _removeClass(currentElement, _globalConfig.activeClass);
+      currentElement = null;
+    }
+  };
+  var _bridge = function() {
+    var flashBridge, len;
+    var container = document.getElementById("global-zeroclipboard-html-bridge");
+    if (!container) {
+      var opts = ZeroClipboard.config();
+      opts.jsModuleId = typeof _amdModuleId === "string" && _amdModuleId || typeof _cjsModuleId === "string" && _cjsModuleId || null;
+      var allowScriptAccess = _determineScriptAccess(window.location.host, _globalConfig);
+      var flashvars = _vars(opts);
+      var swfUrl = _globalConfig.moviePath + _cacheBust(_globalConfig.moviePath, _globalConfig);
+      var html = '      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="global-zeroclipboard-flash-bridge" width="100%" height="100%">         <param name="movie" value="' + swfUrl + '"/>         <param name="allowScriptAccess" value="' + allowScriptAccess + '"/>         <param name="scale" value="exactfit"/>         <param name="loop" value="false"/>         <param name="menu" value="false"/>         <param name="quality" value="best" />         <param name="bgcolor" value="#ffffff"/>         <param name="wmode" value="transparent"/>         <param name="flashvars" value="' + flashvars + '"/>         <embed src="' + swfUrl + '"           loop="false" menu="false"           quality="best" bgcolor="#ffffff"           width="100%" height="100%"           name="global-zeroclipboard-flash-bridge"           allowScriptAccess="' + allowScriptAccess + '"           allowFullScreen="false"           type="application/x-shockwave-flash"           wmode="transparent"           pluginspage="http://www.macromedia.com/go/getflashplayer"           flashvars="' + flashvars + '"           scale="exactfit">         </embed>       </object>';
+      container = document.createElement("div");
+      container.id = "global-zeroclipboard-html-bridge";
+      container.setAttribute("class", "global-zeroclipboard-container");
+      container.style.position = "absolute";
+      container.style.left = "0px";
+      container.style.top = "-9999px";
+      container.style.width = "15px";
+      container.style.height = "15px";
+      container.style.zIndex = "" + _getSafeZIndex(_globalConfig.zIndex);
+      document.body.appendChild(container);
+      container.innerHTML = html;
+    }
+    flashBridge = document["global-zeroclipboard-flash-bridge"];
+    if (flashBridge && (len = flashBridge.length)) {
+      flashBridge = flashBridge[len - 1];
+    }
+    flashState.bridge = flashBridge || container.children[0].lastElementChild;
+  };
+  var _getHtmlBridge = function(flashBridge) {
+    var isFlashElement = /^OBJECT|EMBED$/;
+    var htmlBridge = flashBridge && flashBridge.parentNode;
+    while (htmlBridge && isFlashElement.test(htmlBridge.nodeName) && htmlBridge.parentNode) {
+      htmlBridge = htmlBridge.parentNode;
+    }
+    return htmlBridge || null;
+  };
+  var _reposition = function() {
+    if (currentElement) {
+      var pos = _getDOMObjectPosition(currentElement, _globalConfig.zIndex);
+      var htmlBridge = _getHtmlBridge(flashState.bridge);
+      if (htmlBridge) {
+        htmlBridge.style.top = pos.top + "px";
+        htmlBridge.style.left = pos.left + "px";
+        htmlBridge.style.width = pos.width + "px";
+        htmlBridge.style.height = pos.height + "px";
+        htmlBridge.style.zIndex = pos.zIndex + 1;
+      }
+      if (flashState.ready === true && flashState.bridge) {
+        flashState.bridge.setSize(pos.width, pos.height);
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.on = function(eventName, func) {
+    var i, len, events, added = {}, handlers = _clientMeta[this.id] && _clientMeta[this.id].handlers;
+    if (typeof eventName === "string" && eventName) {
+      events = eventName.toLowerCase().split(/\s+/);
+    } else if (typeof eventName === "object" && eventName && typeof func === "undefined") {
+      for (i in eventName) {
+        if (eventName.hasOwnProperty(i) && typeof i === "string" && i && typeof eventName[i] === "function") {
+          this.on(i, eventName[i]);
+        }
+      }
+    }
+    if (events && events.length) {
+      for (i = 0, len = events.length; i < len; i++) {
+        eventName = events[i].replace(/^on/, "");
+        added[eventName] = true;
+        if (!handlers[eventName]) {
+          handlers[eventName] = [];
+        }
+        handlers[eventName].push(func);
+      }
+      if (added.noflash && flashState.disabled) {
+        _receiveEvent.call(this, "noflash", {});
+      }
+      if (added.wrongflash && flashState.outdated) {
+        _receiveEvent.call(this, "wrongflash", {
+          flashVersion: flashState.version
+        });
+      }
+      if (added.load && flashState.ready) {
+        _receiveEvent.call(this, "load", {
+          flashVersion: flashState.version
+        });
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.off = function(eventName, func) {
+    var i, len, foundIndex, events, perEventHandlers, handlers = _clientMeta[this.id] && _clientMeta[this.id].handlers;
+    if (arguments.length === 0) {
+      events = _objectKeys(handlers);
+    } else if (typeof eventName === "string" && eventName) {
+      events = eventName.split(/\s+/);
+    } else if (typeof eventName === "object" && eventName && typeof func === "undefined") {
+      for (i in eventName) {
+        if (eventName.hasOwnProperty(i) && typeof i === "string" && i && typeof eventName[i] === "function") {
+          this.off(i, eventName[i]);
+        }
+      }
+    }
+    if (events && events.length) {
+      for (i = 0, len = events.length; i < len; i++) {
+        eventName = events[i].toLowerCase().replace(/^on/, "");
+        perEventHandlers = handlers[eventName];
+        if (perEventHandlers && perEventHandlers.length) {
+          if (func) {
+            foundIndex = _inArray(func, perEventHandlers);
+            while (foundIndex !== -1) {
+              perEventHandlers.splice(foundIndex, 1);
+              foundIndex = _inArray(func, perEventHandlers, foundIndex);
+            }
+          } else {
+            handlers[eventName].length = 0;
+          }
+        }
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.handlers = function(eventName) {
+    var prop, copy = null, handlers = _clientMeta[this.id] && _clientMeta[this.id].handlers;
+    if (handlers) {
+      if (typeof eventName === "string" && eventName) {
+        return handlers[eventName] ? handlers[eventName].slice(0) : null;
+      }
+      copy = {};
+      for (prop in handlers) {
+        if (handlers.hasOwnProperty(prop) && handlers[prop]) {
+          copy[prop] = handlers[prop].slice(0);
+        }
+      }
+    }
+    return copy;
+  };
+  var _dispatchClientCallbacks = function(eventName, context, args, async) {
+    var handlers = _clientMeta[this.id] && _clientMeta[this.id].handlers[eventName];
+    if (handlers && handlers.length) {
+      var i, len, func, originalContext = context || this;
+      for (i = 0, len = handlers.length; i < len; i++) {
+        func = handlers[i];
+        context = originalContext;
+        if (typeof func === "string" && typeof window[func] === "function") {
+          func = window[func];
+        }
+        if (typeof func === "object" && func && typeof func.handleEvent === "function") {
+          context = func;
+          func = func.handleEvent;
+        }
+        if (typeof func === "function") {
+          _dispatchCallback(func, context, args, async);
+        }
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.clip = function(elements) {
+    elements = _prepClip(elements);
+    for (var i = 0; i < elements.length; i++) {
+      if (elements.hasOwnProperty(i) && elements[i] && elements[i].nodeType === 1) {
+        if (!elements[i].zcClippingId) {
+          elements[i].zcClippingId = "zcClippingId_" + elementIdCounter++;
+          _elementMeta[elements[i].zcClippingId] = [ this.id ];
+          if (_globalConfig.autoActivate === true) {
+            _addEventHandler(elements[i], "mouseover", _elementMouseOver);
+          }
+        } else if (_inArray(this.id, _elementMeta[elements[i].zcClippingId]) === -1) {
+          _elementMeta[elements[i].zcClippingId].push(this.id);
+        }
+        var clippedElements = _clientMeta[this.id].elements;
+        if (_inArray(elements[i], clippedElements) === -1) {
+          clippedElements.push(elements[i]);
+        }
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.unclip = function(elements) {
+    var meta = _clientMeta[this.id];
+    if (meta) {
+      var clippedElements = meta.elements;
+      var arrayIndex;
+      if (typeof elements === "undefined") {
+        elements = clippedElements.slice(0);
+      } else {
+        elements = _prepClip(elements);
+      }
+      for (var i = elements.length; i--; ) {
+        if (elements.hasOwnProperty(i) && elements[i] && elements[i].nodeType === 1) {
+          arrayIndex = 0;
+          while ((arrayIndex = _inArray(elements[i], clippedElements, arrayIndex)) !== -1) {
+            clippedElements.splice(arrayIndex, 1);
+          }
+          var clientIds = _elementMeta[elements[i].zcClippingId];
+          if (clientIds) {
+            arrayIndex = 0;
+            while ((arrayIndex = _inArray(this.id, clientIds, arrayIndex)) !== -1) {
+              clientIds.splice(arrayIndex, 1);
+            }
+            if (clientIds.length === 0) {
+              if (_globalConfig.autoActivate === true) {
+                _removeEventHandler(elements[i], "mouseover", _elementMouseOver);
+              }
+              delete elements[i].zcClippingId;
+            }
+          }
+        }
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.prototype.elements = function() {
+    var meta = _clientMeta[this.id];
+    return meta && meta.elements ? meta.elements.slice(0) : [];
+  };
+  var _getAllClientsClippedToElement = function(element) {
+    var elementMetaId, clientIds, i, len, client, clients = [];
+    if (element && element.nodeType === 1 && (elementMetaId = element.zcClippingId) && _elementMeta.hasOwnProperty(elementMetaId)) {
+      clientIds = _elementMeta[elementMetaId];
+      if (clientIds && clientIds.length) {
+        for (i = 0, len = clientIds.length; i < len; i++) {
+          client = _clientMeta[clientIds[i]].instance;
+          if (client && client instanceof ZeroClipboard) {
+            clients.push(client);
+          }
+        }
+      }
+    }
+    return clients;
+  };
+  _globalConfig.hoverClass = "zeroclipboard-is-hover";
+  _globalConfig.activeClass = "zeroclipboard-is-active";
+  _globalConfig.trustedOrigins = null;
+  _globalConfig.allowScriptAccess = null;
+  _globalConfig.useNoCache = true;
+  _globalConfig.moviePath = "ZeroClipboard.swf";
+  ZeroClipboard.detectFlashSupport = function() {
+    _deprecationWarning("ZeroClipboard.detectFlashSupport", _globalConfig.debug);
+    return _detectFlashSupport();
+  };
+  ZeroClipboard.dispatch = function(eventName, args) {
+    if (typeof eventName === "string" && eventName) {
+      var cleanEventName = eventName.toLowerCase().replace(/^on/, "");
+      if (cleanEventName) {
+        var clients = currentElement ? _getAllClientsClippedToElement(currentElement) : _getAllClients();
+        for (var i = 0, len = clients.length; i < len; i++) {
+          _receiveEvent.call(clients[i], cleanEventName, args);
+        }
+      }
+    }
+  };
+  ZeroClipboard.prototype.setHandCursor = function(enabled) {
+    _deprecationWarning("ZeroClipboard.prototype.setHandCursor", _globalConfig.debug);
+    enabled = typeof enabled === "boolean" ? enabled : !!enabled;
+    _setHandCursor(enabled);
+    _globalConfig.forceHandCursor = enabled;
+    return this;
+  };
+  ZeroClipboard.prototype.reposition = function() {
+    _deprecationWarning("ZeroClipboard.prototype.reposition", _globalConfig.debug);
+    return _reposition();
+  };
+  ZeroClipboard.prototype.receiveEvent = function(eventName, args) {
+    _deprecationWarning("ZeroClipboard.prototype.receiveEvent", _globalConfig.debug);
+    if (typeof eventName === "string" && eventName) {
+      var cleanEventName = eventName.toLowerCase().replace(/^on/, "");
+      if (cleanEventName) {
+        _receiveEvent.call(this, cleanEventName, args);
+      }
+    }
+  };
+  ZeroClipboard.prototype.setCurrent = function(element) {
+    _deprecationWarning("ZeroClipboard.prototype.setCurrent", _globalConfig.debug);
+    ZeroClipboard.activate(element);
+    return this;
+  };
+  ZeroClipboard.prototype.resetBridge = function() {
+    _deprecationWarning("ZeroClipboard.prototype.resetBridge", _globalConfig.debug);
+    ZeroClipboard.deactivate();
+    return this;
+  };
+  ZeroClipboard.prototype.setTitle = function(newTitle) {
+    _deprecationWarning("ZeroClipboard.prototype.setTitle", _globalConfig.debug);
+    newTitle = newTitle || _globalConfig.title || currentElement && currentElement.getAttribute("title");
+    if (newTitle) {
+      var htmlBridge = _getHtmlBridge(flashState.bridge);
+      if (htmlBridge) {
+        htmlBridge.setAttribute("title", newTitle);
+      }
+    }
+    return this;
+  };
+  ZeroClipboard.setDefaults = function(options) {
+    _deprecationWarning("ZeroClipboard.setDefaults", _globalConfig.debug);
+    ZeroClipboard.config(options);
+  };
+  ZeroClipboard.prototype.addEventListener = function(eventName, func) {
+    _deprecationWarning("ZeroClipboard.prototype.addEventListener", _globalConfig.debug);
+    return this.on(eventName, func);
+  };
+  ZeroClipboard.prototype.removeEventListener = function(eventName, func) {
+    _deprecationWarning("ZeroClipboard.prototype.removeEventListener", _globalConfig.debug);
+    return this.off(eventName, func);
+  };
+  ZeroClipboard.prototype.ready = function() {
+    _deprecationWarning("ZeroClipboard.prototype.ready", _globalConfig.debug);
+    return flashState.ready === true;
+  };
+  var _receiveEvent = function(eventName, args) {
+    eventName = eventName.toLowerCase().replace(/^on/, "");
+    var cleanVersion = args && args.flashVersion && _parseFlashVersion(args.flashVersion) || null;
+    var element = currentElement;
+    var performCallbackAsync = true;
+    switch (eventName) {
+     case "load":
+      if (cleanVersion) {
+        if (!_isFlashVersionSupported(cleanVersion)) {
+          _receiveEvent.call(this, "onWrongFlash", {
+            flashVersion: cleanVersion
+          });
+          return;
+        }
+        flashState.outdated = false;
+        flashState.ready = true;
+        flashState.version = cleanVersion;
+      }
+      break;
+
+     case "wrongflash":
+      if (cleanVersion && !_isFlashVersionSupported(cleanVersion)) {
+        flashState.outdated = true;
+        flashState.ready = false;
+        flashState.version = cleanVersion;
+      }
+      break;
+
+     case "mouseover":
+      _addClass(element, _globalConfig.hoverClass);
+      break;
+
+     case "mouseout":
+      if (_globalConfig.autoActivate === true) {
+        ZeroClipboard.deactivate();
+      }
+      break;
+
+     case "mousedown":
+      _addClass(element, _globalConfig.activeClass);
+      break;
+
+     case "mouseup":
+      _removeClass(element, _globalConfig.activeClass);
+      break;
+
+     case "datarequested":
+      var targetId = element.getAttribute("data-clipboard-target"), targetEl = !targetId ? null : document.getElementById(targetId);
+      if (targetEl) {
+        var textContent = targetEl.value || targetEl.textContent || targetEl.innerText;
+        if (textContent) {
+          this.setText(textContent);
+        }
+      } else {
+        var defaultText = element.getAttribute("data-clipboard-text");
+        if (defaultText) {
+          this.setText(defaultText);
+        }
+      }
+      performCallbackAsync = false;
+      break;
+
+     case "complete":
+      _deleteOwnProperties(_clipData);
+      break;
+    }
+    var context = element;
+    var eventArgs = [ this, args ];
+    return _dispatchClientCallbacks.call(this, eventName, context, eventArgs, performCallbackAsync);
+  };
+  if (typeof define === "function" && define.amd) {
+    define([ "require", "exports", "module" ], function(require, exports, module) {
+      _amdModuleId = module && module.id || null;
+      return ZeroClipboard;
+    });
+  } else if (typeof module === "object" && module && typeof module.exports === "object" && module.exports) {
+    _cjsModuleId = module.id || null;
+    module.exports = ZeroClipboard;
+  } else {
+    window.ZeroClipboard = ZeroClipboard;
+  }
+})();
\ No newline at end of file
diff --git a/src/UI/Mixins/CopyToClipboard.js b/src/UI/Mixins/CopyToClipboard.js
new file mode 100644
index 000000000..f271b249e
--- /dev/null
+++ b/src/UI/Mixins/CopyToClipboard.js
@@ -0,0 +1,30 @@
+'use strict';
+
+define([
+    'jquery',
+    'System/StatusModel',
+    'zero.clipboard',
+    'Shared/Messenger'
+],
+    function ($, StatusModel, ZeroClipboard, Messenger) {
+
+    $.fn.copyToClipboard = function (input) {
+        var moviePath = StatusModel.get('urlBase') + '/Content/zero.clipboard.swf';
+
+        var client = new ZeroClipboard(this, {
+            moviePath: moviePath
+        });
+
+        client.on('load', function(client) {
+            client.on('dataRequested', function (client) {
+                client.setText(input.val());
+            });
+
+            client.on('complete', function() {
+                Messenger.show({
+                    message: 'Copied text to clipboard'
+                });
+            } );
+        } );
+    };
+});
diff --git a/src/UI/Mixins/backbone.signalr.mixin.js b/src/UI/Mixins/backbone.signalr.mixin.js
index a29ed4882..72e0e7108 100644
--- a/src/UI/Mixins/backbone.signalr.mixin.js
+++ b/src/UI/Mixins/backbone.signalr.mixin.js
@@ -39,7 +39,7 @@ define(
                     console.log(options.action + ': {0}}'.format(options.resource));
                 };
 
-                collection.listenTo(vent, 'server:' + collection.url.replace('/api/', ''), processMessage);
+                collection.listenTo(vent, 'server:' + collection.url.split('/api/')[1], processMessage);
 
                 return this;
             },
diff --git a/src/UI/Series/Editor/Rename/RenameSeriesView.js b/src/UI/Series/Editor/Organize/OrganizeFilesView.js
similarity index 80%
rename from src/UI/Series/Editor/Rename/RenameSeriesView.js
rename to src/UI/Series/Editor/Organize/OrganizeFilesView.js
index c573433bf..4be006dde 100644
--- a/src/UI/Series/Editor/Rename/RenameSeriesView.js
+++ b/src/UI/Series/Editor/Organize/OrganizeFilesView.js
@@ -9,10 +9,10 @@ define(
     ], function (_, vent, Backbone, Marionette, CommandController) {
 
         return  Marionette.ItemView.extend({
-            template: 'Series/Editor/Rename/RenameSeriesViewTemplate',
+            template: 'Series/Editor/Organize/OrganizeFilesViewTemplate',
 
             events: {
-                'click .x-confirm-rename': '_rename'
+                'click .x-confirm-organize': '_organize'
             },
 
             initialize: function (options) {
@@ -21,7 +21,7 @@ define(
                 this.templateHelpers = { numberOfSeries: this.series.length, series: new Backbone.Collection(this.series).toJSON() };
             },
 
-            _rename: function () {
+            _organize: function () {
                 var seriesIds = _.pluck(this.series, 'id');
 
                 CommandController.Execute('renameSeries', {
@@ -29,7 +29,7 @@ define(
                     seriesIds : seriesIds
                 });
 
-                this.trigger('seriesRenamed');
+                this.trigger('organizingFiles');
                 vent.trigger(vent.Commands.CloseModalCommand);
             }
         });
diff --git a/src/UI/Series/Editor/Rename/RenameSeriesViewTemplate.html b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.html
similarity index 54%
rename from src/UI/Series/Editor/Rename/RenameSeriesViewTemplate.html
rename to src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.html
index e9c2e58c7..09465b198 100644
--- a/src/UI/Series/Editor/Rename/RenameSeriesViewTemplate.html
+++ b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.html
@@ -1,23 +1,23 @@
 <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3>Rename Selected Series</h3>
+    <h3>Organize of Selected Series</h3>
 </div>
-<div class="modal-body rename-series-modal">
+<div class="modal-body update-files-series-modal">
     <div class="alert alert-info">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
-        You can use the rename function for an individual series to preview the rename
+        Tip: To preview a rename... select "Cancel" then any series title and use the <i data-original-title="" class="icon-nd-rename" title=""></i>
     </div>
 
-    Are you sure you want to rename all files in the {{numberOfSeries}} selected series?
+    Are you sure you want to update all files in the {{numberOfSeries}} selected series?
 
     {{debug}}
     <ul class="selected-series">
         {{#each series}}
-            <li>{{title}}</li>
+        <li>{{title}}</li>
         {{/each}}
     </ul>
 </div>
 <div class="modal-footer">
     <button class="btn" data-dismiss="modal">cancel</button>
-    <button class="btn btn-danger x-confirm-rename">rename</button>
+    <button class="btn btn-danger x-confirm-organize">organize</button>
 </div>
diff --git a/src/UI/Series/Editor/SeriesEditorFooterView.js b/src/UI/Series/Editor/SeriesEditorFooterView.js
index cf02a09f1..4a33d51f6 100644
--- a/src/UI/Series/Editor/SeriesEditorFooterView.js
+++ b/src/UI/Series/Editor/SeriesEditorFooterView.js
@@ -10,7 +10,7 @@ define(
         'AddSeries/RootFolders/RootFolderCollection',
         'Shared/Toolbar/ToolbarLayout',
         'AddSeries/RootFolders/RootFolderLayout',
-        'Series/Editor/Rename/RenameSeriesView',
+        'Series/Editor/Organize/OrganizeFilesView',
         'Config'
     ], function (_,
                  Marionette,
@@ -21,26 +21,26 @@ define(
                  RootFolders,
                  ToolbarLayout,
                  RootFolderLayout,
-                 RenameSeriesView,
+                 UpdateFilesSeriesView,
                  Config) {
         return Marionette.ItemView.extend({
             template: 'Series/Editor/SeriesEditorFooterViewTemplate',
 
             ui: {
-                monitored     : '.x-monitored',
-                qualityProfile: '.x-quality-profiles',
-                seasonFolder  : '.x-season-folder',
-                rootFolder    : '.x-root-folder',
-                selectedCount : '.x-selected-count',
-                saveButton    : '.x-save',
-                renameButton  : '.x-rename',
-                container     : '.series-editor-footer'
+                monitored           : '.x-monitored',
+                qualityProfile      : '.x-quality-profiles',
+                seasonFolder        : '.x-season-folder',
+                rootFolder          : '.x-root-folder',
+                selectedCount       : '.x-selected-count',
+                saveButton          : '.x-save',
+                organizeFilesButton : '.x-organize-files',
+                container           : '.series-editor-footer'
             },
 
             events: {
-                'click .x-save'        : '_updateAndSave',
-                'change .x-root-folder': '_rootFolderChanged',
-                'click .x-rename'      : '_rename'
+                'click .x-save'           : '_updateAndSave',
+                'change .x-root-folder'   : '_rootFolderChanged',
+                'click .x-organize-files' : '_organizeFiles'
             },
 
             templateHelpers: function () {
@@ -119,7 +119,7 @@ define(
                     this.ui.seasonFolder.attr('disabled', '');
                     this.ui.rootFolder.attr('disabled', '');
                     this.ui.saveButton.attr('disabled', '');
-                    this.ui.renameButton.attr('disabled', '');
+                    this.ui.organizeFilesButton.attr('disabled', '');
                 }
 
                 else {
@@ -128,7 +128,7 @@ define(
                     this.ui.seasonFolder.removeAttr('disabled', '');
                     this.ui.rootFolder.removeAttr('disabled', '');
                     this.ui.saveButton.removeAttr('disabled', '');
-                    this.ui.renameButton.removeAttr('disabled', '');
+                    this.ui.organizeFilesButton.removeAttr('disabled', '');
                 }
             },
 
@@ -162,12 +162,12 @@ define(
                 });
             },
 
-            _rename: function () {
+            _organizeFiles: function () {
                 var selected = this.editorGrid.getSelectedModels();
-                var renameSeriesView = new RenameSeriesView({ series: selected });
-                this.listenToOnce(renameSeriesView, 'seriesRenamed', this._afterSave);
+                var updateFilesSeriesView = new UpdateFilesSeriesView({ series: selected });
+                this.listenToOnce(updateFilesSeriesView, 'updatingFiles', this._afterSave);
 
-                vent.trigger(vent.Commands.OpenModalCommand, renameSeriesView);
+                vent.trigger(vent.Commands.OpenModalCommand, updateFilesSeriesView);
             }
         });
     });
diff --git a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html
index 88a1d382c..b6827fbb5 100644
--- a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html
+++ b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html
@@ -45,7 +45,7 @@
         <span class="pull-right">
             <span class="selected-count x-selected-count">0  series selected</span>
             <button class="btn btn-primary x-save">Save</button>
-            <button class="btn btn-danger x-rename">Rename</button>
+            <button class="btn btn-danger x-organize-files">Organize</button>
         </span>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Series/SeriesCollection.js b/src/UI/Series/SeriesCollection.js
index 4f00e6c42..8bc23630e 100644
--- a/src/UI/Series/SeriesCollection.js
+++ b/src/UI/Series/SeriesCollection.js
@@ -18,7 +18,7 @@ define(
             state: {
                 sortKey: 'title',
                 order  : -1,
-                pageSize: 1000
+                pageSize: 100000
             },
 
             mode: 'client',
diff --git a/src/UI/Series/series.less b/src/UI/Series/series.less
index c20cd0f76..96f0e1137 100644
--- a/src/UI/Series/series.less
+++ b/src/UI/Series/series.less
@@ -314,9 +314,13 @@
   .row {
     margin-left: -40px;
   }
+
+  .span2 {
+    width: 160px;
+  }
 }
 
-.rename-series-modal {
+.update-files-series-modal {
   .selected-series {
     margin-top: 15px;
   }
diff --git a/src/UI/Settings/DownloadClient/Options/DownloadClientOptionsViewTemplate.html b/src/UI/Settings/DownloadClient/Options/DownloadClientOptionsViewTemplate.html
index 888161027..b6824fb6b 100644
--- a/src/UI/Settings/DownloadClient/Options/DownloadClientOptionsViewTemplate.html
+++ b/src/UI/Settings/DownloadClient/Options/DownloadClientOptionsViewTemplate.html
@@ -11,4 +11,16 @@
             </span>
         </div>
     </div>
+
+    <div class="control-group advanced-setting">
+        <label class="control-label">Drone Factory Internal</label>
+
+        <div class="controls">
+            <input type="number" name="downloadedEpisodesScanInterval"/>
+                <span class="help-inline">
+                    <i class="icon-nd-form-info" title="Interval in minutes to scan the Drone Factory. Set to zero to disable."/>
+                    <i class="icon-nd-form-warning" title="Setting a high interval or disabling scanning will prevent episodes from being imported."></i>
+                </span>
+        </div>
+    </div>
 </fieldset>
\ No newline at end of file
diff --git a/src/UI/Settings/General/GeneralView.js b/src/UI/Settings/General/GeneralView.js
index df61a4c71..2e63d2de5 100644
--- a/src/UI/Settings/General/GeneralView.js
+++ b/src/UI/Settings/General/GeneralView.js
@@ -1,23 +1,34 @@
 'use strict';
 define(
     [
+        'vent',
         'marionette',
+        'Commands/CommandController',
         'Mixins/AsModelBoundView',
-        'Mixins/AsValidatedView'
-    ], function (Marionette, AsModelBoundView, AsValidatedView) {
+        'Mixins/AsValidatedView',
+        'Mixins/CopyToClipboard'
+    ], function (vent, Marionette, CommandController, AsModelBoundView, AsValidatedView) {
         var view = Marionette.ItemView.extend({
             template: 'Settings/General/GeneralViewTemplate',
 
             events: {
-                'change .x-auth': '_setAuthOptionsVisibility',
-                'change .x-ssl': '_setSslOptionsVisibility'
+                'change .x-auth'         : '_setAuthOptionsVisibility',
+                'change .x-ssl'          : '_setSslOptionsVisibility',
+                'click .x-reset-api-key' : '_resetApiKey'
             },
 
             ui: {
-                authToggle : '.x-auth',
-                authOptions: '.x-auth-options',
-                sslToggle : '.x-ssl',
-                sslOptions: '.x-ssl-options'
+                authToggle  : '.x-auth',
+                authOptions : '.x-auth-options',
+                sslToggle   : '.x-ssl',
+                sslOptions  : '.x-ssl-options',
+                resetApiKey : '.x-reset-api-key',
+                copyApiKey  : '.x-copy-api-key',
+                apiKeyInput : '.x-api-key'
+            },
+
+            initialize: function () {
+                vent.on(vent.Events.CommandComplete, this._commandComplete, this);
             },
 
             onRender: function(){
@@ -28,6 +39,17 @@ define(
                 if(!this.ui.sslToggle.prop('checked')){
                     this.ui.sslOptions.hide();
                 }
+
+                CommandController.bindToCommand({
+                    element: this.ui.resetApiKey,
+                    command: {
+                        name: 'resetApiKey'
+                    }
+                });
+            },
+
+            onShow: function () {
+                this.ui.copyApiKey.copyToClipboard(this.ui.apiKeyInput);
             },
 
             _setAuthOptionsVisibility: function () {
@@ -54,6 +76,20 @@ define(
                 else {
                     this.ui.sslOptions.slideUp();
                 }
+            },
+
+            _resetApiKey: function () {
+                if (window.confirm("Reset API Key?")) {
+                    CommandController.Execute('resetApiKey', {
+                        name : 'resetApiKey'
+                    });
+                }
+            },
+
+            _commandComplete: function (options) {
+                if (options.command.get('name') === 'resetapikey') {
+                    this.model.fetch();
+                }
             }
         });
 
diff --git a/src/UI/Settings/General/GeneralViewTemplate.html b/src/UI/Settings/General/GeneralViewTemplate.html
index 44d9e3d11..c05f5f6e8 100644
--- a/src/UI/Settings/General/GeneralViewTemplate.html
+++ b/src/UI/Settings/General/GeneralViewTemplate.html
@@ -13,6 +13,18 @@
             </div>
         </div>
 
+        <div class="control-group">
+            <label class="control-label">URL Base</label>
+
+            <div class="controls">
+                <input type="text" name="urlBase"/>
+                <span>
+                    <i class="icon-nd-form-warning" title="Requires restart to take effect"/>
+                    <i class="icon-nd-form-info" title="For reverse proxy support, default is empty"/>
+                </span>
+            </div>
+        </div>
+
         <div class="control-group advanced-setting">
             <label class="control-label">Enable SSL</label>
 
@@ -107,6 +119,21 @@
                 </div>
             </div>
         </div>
+
+        <div class="control-group api-key">
+            <label class="control-label">API Key</label>
+            <div class="controls">
+                <div class="input-append">
+                    <input type="text" name="apiKey" readonly="readonly" class="x-api-key"/>
+                    <button class="btn btn-icon-only x-copy-api-key" title="Copy to clipboard"><i class="icon-copy"></i></button>
+                    <button class="btn btn-danger btn-icon-only x-reset-api-key" title="Reset API Key"><i class="icon-refresh"></i></button>
+                </div>
+
+                <span>
+                    <i class="icon-nd-form-warning" title="Requires restart to take effect"/>
+                </span>
+            </div>
+        </div>
     </fieldset>
 
     <fieldset>
@@ -142,5 +169,28 @@
                 <input type="text" placeholder="master" name="branch"/>
             </div>
         </div>
+
+        <!--{{#if_mono}}-->
+        <!--<div class="control-group">-->
+            <!--<label class="control-label">Auto Update</label>-->
+
+            <!--<div class="controls">-->
+                <!--<label class="checkbox toggle well">-->
+                    <!--<input type="checkbox" name="autoUpdate"/>-->
+
+                    <!--<p>-->
+                        <!--<span>Yes</span>-->
+                        <!--<span>No</span>-->
+                    <!--</p>-->
+
+                    <!--<div class="btn btn-primary slide-button"/>-->
+                <!--</label>-->
+
+                <!--<span class="help-inline-checkbox">-->
+                    <!--<i class="icon-nd-form-info" title="Use drone's built in auto update instead of package manager/manual updating"/>-->
+                <!--</span>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--{{/if_mono}}-->
     </fieldset>
 </div>
diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
index c984fbef1..6e7de342c 100644
--- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.html
@@ -51,4 +51,19 @@
             </span>
         </div>
     </div>
+
+    <div class="control-group">
+        <label class="control-label">Change File Date</label>
+
+        <div class="controls">
+            <select class="inputClass" name="fileDate">
+                <option value="none">None</option>
+                <option value="localAirDate">Local Air Date</option>
+                <option value="utcAirDate">UTC Air Date</option>
+            </select>
+            <span class="help-inline">
+                <i class="icon-nd-form-info" title="Change file date on import/rescan"/>
+            </span>
+        </div>
+    </div>
 </fieldset>
diff --git a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
index ca0a685a7..2a15e6420 100644
--- a/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
+++ b/src/UI/Settings/MediaManagement/Permissions/PermissionsViewTemplate.html
@@ -1,4 +1,4 @@
-{{#if_linux}}
+{{#if_mono}}
 <fieldset class="advanced-setting">
     <legend>Permissions</legend>
 
@@ -67,4 +67,4 @@
         </div>
     </div>
 </fieldset>
-{{/if_linux}}
\ No newline at end of file
+{{/if_mono}}
\ No newline at end of file
diff --git a/src/UI/Settings/settings.less b/src/UI/Settings/settings.less
index 9f0ce6ac2..c46a629bc 100644
--- a/src/UI/Settings/settings.less
+++ b/src/UI/Settings/settings.less
@@ -93,3 +93,11 @@ li.save-and-add:hover {
     display: none;
   }
 }
+
+.api-key {
+
+  input {
+    width  : 280px;
+    cursor : text;
+  }
+}
diff --git a/src/UI/Shared/Grid/JumpToPageTemplate.html b/src/UI/Shared/Grid/JumpToPageTemplate.html
new file mode 100644
index 000000000..d257ccc6d
--- /dev/null
+++ b/src/UI/Shared/Grid/JumpToPageTemplate.html
@@ -0,0 +1,9 @@
+<select class="x-page-select">
+    {{#each pages}}
+        {{#if current}}
+            <option value="{{page}}" selected="selected">{{page}}</option>
+        {{else}}
+            <option value="{{page}}">{{page}}</option>
+        {{/if}}
+    {{/each}}
+</select>
\ No newline at end of file
diff --git a/src/UI/Shared/Grid/Pager.js b/src/UI/Shared/Grid/Pager.js
index e230f8d1d..876f1fe5d 100644
--- a/src/UI/Shared/Grid/Pager.js
+++ b/src/UI/Shared/Grid/Pager.js
@@ -1,16 +1,20 @@
 'use strict';
 define(
     [
+        'jquery',
         'marionette',
         'backgrid.paginator'
-    ], function (Marionette, Paginator) {
+    ], function ($, Marionette, Paginator) {
 
         return Paginator.extend({
 
             template: 'Shared/Grid/PagerTemplate',
 
             events: {
-                'click .pager-btn': 'changePage'
+                'click .pager-btn'      : 'changePage',
+                'click .x-page-number'  : '_showPageJumper',
+                'change .x-page-select' : '_jumpToPage',
+                'blur .x-page-select'   : 'render'
             },
 
             windowSize: 1,
@@ -25,7 +29,7 @@ define(
             changePage: function (e) {
                 e.preventDefault();
 
-                var target =this.$(e.target);
+                var target = this.$(e.target);
 
                 if (target.closest('li').hasClass('disabled')) {
                     return;
@@ -77,7 +81,7 @@ define(
                 var lastPage = +state.lastPage;
                 lastPage = Math.max(0, firstPage ? lastPage - 1 :lastPage);
                 var currentPage = Math.max(state.currentPage, state.firstPage);
-                currentPage = firstPage ? currentPage - 1 :currentPage;
+                currentPage = firstPage ? currentPage - 1 : currentPage;
                 var windowStart = Math.floor(currentPage / this.windowSize) * this.windowSize;
                 var windowEnd = Math.min(lastPage + 1, windowStart + this.windowSize);
 
@@ -145,6 +149,45 @@ define(
                 this.delegateEvents();
 
                 return this;
+            },
+
+            _showPageJumper: function (e) {
+                if ($(e.target).is('select')) {
+                    return;
+                }
+
+                var templateFunction = Marionette.TemplateCache.get('Shared/Grid/JumpToPageTemplate');
+                var state = this.collection.state;
+                var currentPage = Math.max(state.currentPage, state.firstPage);
+                currentPage = state.firstPage ? currentPage - 1 : currentPage;
+
+                var pages = [];
+
+                for (var i = 0; i < this.collection.state.lastPage; i++) {
+                    if (i === currentPage) {
+                        pages.push({ page: i + 1, current: true });
+                    }
+
+                    else {
+                        pages.push({ page: i + 1 });
+                    }
+                }
+
+                this.$el.find('.x-page-number').html(templateFunction({
+                    pages      : pages
+                }));
+            },
+
+            _jumpToPage: function () {
+                var target = this.$el.find('.x-page-select');
+
+                //Remove event handlers so the blur event is not triggered
+                this.undelegateEvents();
+
+                var selectedPage = parseInt(target.val(), 10);
+
+                this.$el.find('.x-page-number').html('<i class="icon-spinner icon-spin"></i>');
+                this.collection.getPage(selectedPage);
             }
         });
     });
diff --git a/src/UI/Shared/Grid/PagerTemplate.html b/src/UI/Shared/Grid/PagerTemplate.html
index 3e829409e..44b6f9d78 100644
--- a/src/UI/Shared/Grid/PagerTemplate.html
+++ b/src/UI/Shared/Grid/PagerTemplate.html
@@ -2,7 +2,7 @@
     {{#each handles}}
         <li {{#if className}}class="{{className}}"{{/if}} >
             {{#if pageNumber}}
-                <span>{{pageNumber}} / {{lastPage}}</span>
+                <span class="x-page-number">{{pageNumber}} / {{lastPage}}</span>
             {{else}}
             <i class="pager-btn clickable {{label}}" data-action="{{action}}"/>
             {{/if}}
diff --git a/src/UI/app.js b/src/UI/app.js
index 2ab1cbdd1..85d8a566d 100644
--- a/src/UI/app.js
+++ b/src/UI/app.js
@@ -27,6 +27,7 @@ require.config({
         'jquery.dotdotdot'        : 'JsLibraries/jquery.dotdotdot',
         'messenger'               : 'JsLibraries/messenger',
         'jquery'                  : 'JsLibraries/jquery',
+        'zero.clipboard'          : 'JsLibraries/zero.clipboard',
         'libs'                    : 'JsLibraries/',
 
         'api': 'Require/require.api'
diff --git a/src/UpgradeLog.htm b/src/UpgradeLog.htm
deleted file mode 100644
index 2732cdfdc..000000000
Binary files a/src/UpgradeLog.htm and /dev/null differ
diff --git a/src/UpgradeLog2.htm b/src/UpgradeLog2.htm
deleted file mode 100644
index 2732cdfdc..000000000
Binary files a/src/UpgradeLog2.htm and /dev/null differ