diff --git a/src/core.py b/src/core.py
index 387a8b5..3fd927c 100755
--- a/src/core.py
+++ b/src/core.py
@@ -275,7 +275,6 @@ def scan_folder(path):
 def pickforgirlscouts(video):
     if video.sufficientInfo():
         video.moveLocation()
-        print(video.home)
         return True
 
     return False
diff --git a/src/video.py b/src/video.py
index 141cd1e..4eae332 100644
--- a/src/video.py
+++ b/src/video.py
@@ -183,14 +183,14 @@ class Episode(Video):
 
     def moveLocation(self):
         series = titlecase(self.series)
-        grandParent = '{}/{} {:02d}'.format(series, series, self.season)
+        grandParent = '{}/{} Season {:02d}'.format(series, series, self.season)
         parent = '{} S{:02d}E{:02d}'.format(series, self.season, self.episode)
-        self.home = os.path.join(grandParent, parent, self.name)
+        self.home = os.path.join(grandParent, parent, os.path.basename(self.name))
 
     def __repr__(self):
         if self.year is None:
             return '<%s [%r, %dx%s]>' % (self.__class__.__name__, self.series, self.season, self.episode)
-        if self.subtitles is not None:
+        if self.subtitles is not None and len(self.subtitles) > 0:
             return '<%s [%r, %dx%s] %s>' % (self.__class__.__name__, self.series, self.season, self.episode, self.subtitles)
 
         return '<%s [%r, %d, %dx%d]>' % (self.__class__.__name__, self.series, self.year, self.season, self.episode)