diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index 7e2c3573..30ebc7c6 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -552,7 +552,8 @@ def uploadToImgur(imgPath, imgTitle=''):
         response = json.loads(response.read())
     
         if response.get('status') == 200:
-            logger.debug(u"PlexPy Helpers :: Image uploaded to Imgur.")
+            t = '\'' + imgTitle + '\' ' if imgTitle else ''
+            logger.debug(u"PlexPy Helpers :: Image %suploaded to Imgur." % t)
             img_url = response.get('data').get('link', '')
         elif response.get('status') >= 400 and response.get('status') < 500:
             logger.warn(u"PlexPy Helpers :: Unable to upload image to Imgur: %s" % response.reason)
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index ffce9b4b..12ec62bd 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -2169,50 +2169,53 @@ class FacebookNotifier(object):
             if self.incl_poster and 'metadata' in kwargs:
                 metadata = kwargs['metadata']
                 poster_url = metadata.get('poster_url','')
+                caption = ''
 
                 if poster_url:
                     if metadata['media_type'] == 'movie':
-                        title = metadata['title']
-                        subtitle = metadata['year']
+                        title = '%s (%s)' % (metadata['title'], metadata['year'])
+                        subtitle = metadata['summary']
                         rating_key = metadata['rating_key']
                         if metadata.get('imdb_url',''):
                             poster_link = metadata.get('imdb_url', '')
-                            caption = 'View on IMDB.'
+                            caption = 'View on IMDB'
                         elif metadata.get('themoviedb_url',''):
                             poster_link = metadata.get('themoviedb_url', '')
-                            caption = 'View on The Movie Database.'
+                            caption = 'View on The Movie Database'
 
                     elif metadata['media_type'] == 'show':
-                        title = metadata['title']
-                        subtitle = metadata['year']
+                        title = '%s (%s)' % (metadata['title'], metadata['year'])
+                        subtitle = metadata['summary']
                         rating_key = metadata['rating_key']
                         if metadata.get('thetvdb_url',''):
                             poster_link = metadata.get('thetvdb_url', '')
-                            caption = 'View on TheTVDB.'
+                            caption = 'View on TheTVDB'
                         elif metadata.get('themoviedb_url',''):
                             poster_link = metadata.get('themoviedb_url', '')
-                            caption = 'View on The Movie Database.'
+                            caption = 'View on The Movie Database'
 
                     elif metadata['media_type'] == 'episode':
-                        title = '%s - %s' % (metadata['grandparent_title'], metadata['title'])
-                        subtitle = 'S%s %s E%s' % (metadata['parent_media_index'],
-                                                   '\xc2\xb7'.decode('utf8'),
-                                                   metadata['media_index'])
+                        title = '%s - %s (S%s %s E%s)' % (metadata['grandparent_title'],
+                                                          metadata['title'],
+                                                          metadata['parent_media_index'],
+                                                          '\xc2\xb7'.decode('utf8'),
+                                                          metadata['media_index'])
+                        subtitle = metadata['summary']
                         rating_key = metadata['rating_key']
                         if metadata.get('thetvdb_url',''):
                             poster_link = metadata.get('thetvdb_url', '')
-                            caption = 'View on TheTVDB.'
+                            caption = 'View on TheTVDB'
                         elif metadata.get('themoviedb_url',''):
                             poster_link = metadata.get('themoviedb_url', '')
-                            caption = 'View on The Movie Database.'
+                            caption = 'View on The Movie Database'
 
                     elif metadata['media_type'] == 'artist':
                         title = metadata['title']
-                        subtitle = ''
+                        subtitle = metadata['summary']
                         rating_key = metadata['rating_key']
                         if metadata.get('lastfm_url',''):
                             poster_link = metadata.get('lastfm_url', '')
-                            caption = 'View on Last.fm.'
+                            caption = 'View on Last.fm'
 
                     elif metadata['media_type'] == 'track':
                         title = '%s - %s' % (metadata['grandparent_title'], metadata['title'])
@@ -2220,23 +2223,22 @@ class FacebookNotifier(object):
                         rating_key = metadata['parent_rating_key']
                         if metadata.get('lastfm_url',''):
                             poster_link = metadata.get('lastfm_url', '')
-                            caption = 'View on Last.fm.'
+                            caption = 'View on Last.fm'
 
                     # Build Facebook post attachment
                     if self.incl_pmslink:
-                        caption = 'View on Plex Web.'
+                        caption = 'View on Plex Web'
                         attachment['link'] = 'http://app.plex.tv/web/app#!/server/' + plexpy.CONFIG.PMS_IDENTIFIER + \
                                              '/details/%2Flibrary%2Fmetadata%2F' + rating_key
-                        attachment['caption'] = caption
                     elif poster_link:
                         attachment['link'] = poster_link
-                        attachment['caption'] = caption
                     else:
                         attachment['link'] = poster_url
 
                     attachment['picture'] = poster_url
                     attachment['name'] = title
                     attachment['description'] = subtitle
+                    attachment['caption'] = caption
 
             try:
                 api.put_wall_post(profile_id=self.group_id, message=message, attachment=attachment)