diff --git a/Libraries/SQLite.Interop.dll b/Libraries/SQLite.Interop.dll
index 5f2e272e5..1e1e6fe5a 100644
Binary files a/Libraries/SQLite.Interop.dll and b/Libraries/SQLite.Interop.dll differ
diff --git a/NzbDrone.Core.Test/EpisodeStatusTest.cs b/NzbDrone.Core.Test/EpisodeStatusTest.cs
index f84c5d127..61b87ee03 100644
--- a/NzbDrone.Core.Test/EpisodeStatusTest.cs
+++ b/NzbDrone.Core.Test/EpisodeStatusTest.cs
@@ -17,7 +17,6 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.NotAired)]
         [Row(-2, false, false, EpisodeStatusType.Missing)]
         [Row(1, true, false, EpisodeStatusType.Ready)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
         {
@@ -43,7 +42,6 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.NotAired)]
         [Row(-2, false, false, EpisodeStatusType.Missing)]
         [Row(1, true, false, EpisodeStatusType.Ready)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
                                                  EpisodeStatusType status)
@@ -70,8 +68,8 @@ namespace NzbDrone.Core.Test
         [Row(1, false, false, EpisodeStatusType.Downloading)]
         [Row(-2, false, false, EpisodeStatusType.Downloading)]
         [Row(1, true, false, EpisodeStatusType.Downloading)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
-        [Row(1, false, true, EpisodeStatusType.Ignored)]
+        [Row(1, true, true, EpisodeStatusType.Downloading)]
+        [Row(1, false, true, EpisodeStatusType.Downloading)]
         public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
                                                     EpisodeStatusType status)
         {
@@ -95,8 +93,6 @@ namespace NzbDrone.Core.Test
         [Test]
         [Row(1, false, false, EpisodeStatusType.Ignored)]
         [Row(-2, false, false, EpisodeStatusType.Ignored)]
-        [Row(1, true, false, EpisodeStatusType.Ignored)]
-        [Row(1, true, true, EpisodeStatusType.Ignored)]
         [Row(1, false, true, EpisodeStatusType.Ignored)]
         public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
         {
@@ -104,8 +100,10 @@ namespace NzbDrone.Core.Test
                 .With(e => e.AirDate = DateTime.Now.AddDays(offsetDays))
                 .With(e => e.Ignored = ignored)
                 .With(e => e.EpisodeFileId = 0)
+                .With(e => e.GrabDate = null)
                 .With(e => e.Season = Builder<Season>.CreateNew()
                                           .With(s => s.Monitored == false).Build())
+
                 .Build();
 
             if (hasEpisodes)
@@ -124,12 +122,12 @@ namespace NzbDrone.Core.Test
                 .With(e => e.AirDate = DateTime.Now.AddYears(-200))
                 .With(e => e.Ignored = false)
                 .With(e => e.EpisodeFileId = 0)
-                .With(e=>e.GrabDate =null)
+                .With(e => e.GrabDate = null)
                 .With(e => e.Season = Builder<Season>.CreateNew()
                                           .With(s => s.Monitored = true).Build())
                 .Build();
 
-         
+
             Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status);
         }
     }
diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs
index 99d989458..fad97ee6a 100644
--- a/NzbDrone.Core/Repository/Episode.cs
+++ b/NzbDrone.Core/Repository/Episode.cs
@@ -49,17 +49,17 @@ namespace NzbDrone.Core.Repository
         {
             get
             {
-                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
-
-                var season = Season;
-
-                if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
-
                 if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now)
                 {
                     return EpisodeStatusType.Downloading;
                 }
 
+                if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
+
+                var season = Season;
+
+                if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
+                
                 if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date)
                 {
                     return EpisodeStatusType.Missing;
diff --git a/package.bat b/package.bat
index 114603e9b..202d75bc8 100644
--- a/package.bat
+++ b/package.bat
@@ -1,15 +1,20 @@
-SET TARGET=_deploy
+SET PACKAGEROOT=_rawPackage
+SET TARGET=%PACKAGEROOT%\NzbDrone
 
-rmdir /s "%TARGET%"
-xcopy IISExpress %TARGET%\IISExpress /E /V /I /F /Y
-xcopy NzbDrone\bin\Release\*.*  %TARGET%\ /E /V /I /F /Y
+xcopy IISExpress %TARGET%\IISExpress /E /V /I /Y
+xcopy NzbDrone\bin\Release\*.*  %TARGET%\ /E /V /I /Y
 
-xcopy NzbDrone.Web\bin\*.*  %TARGET%\NzbDrone.Web\bin\ /E /V /I /F /Y
-xcopy NzbDrone.Web\App_GlobalResources\*.*  %TARGET%\NzbDrone.Web\App_GlobalResources\ /E /V /I /F /Y
-xcopy NzbDrone.Web\Content\*.*  %TARGET%\NzbDrone.Web\Content\ /E /V /I /F /Y
-xcopy NzbDrone.Web\Scripts\*.*  %TARGET%\NzbDrone.Web\Scripts\ /E /V /I /F /Y
-xcopy NzbDrone.Web\Views\*.*  %TARGET%\NzbDrone.Web\Views\ /E /V /I /F /Y
+del %TARGET%\nlog.xml
+del %TARGET%\*.vshost.exe.*
 
+xcopy NzbDrone.Web\bin\*.*  %TARGET%\NzbDrone.Web\bin\ /E /V /I /Y
+xcopy NzbDrone.Web\App_GlobalResources\*.*  %TARGET%\NzbDrone.Web\App_GlobalResources\ /E /V /I /Y
+xcopy NzbDrone.Web\Content\*.*  %TARGET%\NzbDrone.Web\Content\ /E /V /I /Y
+xcopy NzbDrone.Web\Scripts\*.*  %TARGET%\NzbDrone.Web\Scripts\ /E /V /I /Y
+xcopy NzbDrone.Web\Views\*.*  %TARGET%\NzbDrone.Web\Views\ /E /V /I /Y
+
+del %TARGET%\NzbDrone.Web\bin\*.xml /q
+del %TARGET%\NzbDrone.Web\bin\ninject*.pdb /q
 
 xcopy NzbDrone.Web\log.config  %TARGET%\NzbDrone.Web\
 xcopy NzbDrone.Web\Global.asax  %TARGET%\NzbDrone.Web\
@@ -17,7 +22,8 @@ xcopy NzbDrone.Web\favicon.ico  %TARGET%\NzbDrone.Web\
 xcopy NzbDrone.Web\web.config  %TARGET%\NzbDrone.Web\ 
 
 
-CD "%TARGET%"
-..\Libraries\7zip\7za.exe a -tzip   NzbDrone.zip *
-..\Libraries\7zip\7za.exe t NzbDrone.zip
-cD ..
\ No newline at end of file
+CD %PACKAGEROOT%
+..\Libraries\7zip\7za.exe a -tzip ..\NzbDrone.zip *
+
+CD ..
+Pause
\ No newline at end of file