diff --git a/templates/image.html b/templates/image.html
index 49df030..d70a035 100644
--- a/templates/image.html
+++ b/templates/image.html
@@ -26,5 +26,5 @@
 
 <meta property="og:description" content="{{ desc }}" />
 
-<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlUserLink }}&ttype=photo" type="application/json+oembed" title="{{ user }}">
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlUserLink }}&ttype=photo&provider={{ appname }}" type="application/json+oembed" title="{{ user }}">
 <meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/templates/text.html b/templates/text.html
index 3bd7626..864f5a2 100644
--- a/templates/text.html
+++ b/templates/text.html
@@ -30,5 +30,5 @@
 
 <meta property="og:description" content="{{ desc }}" />
 
-<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlUserLink }}&ttype=link" type="application/json+oembed" title="{{ user }}">
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlUserLink }}&ttype=link&provider={{ appname }}" type="application/json+oembed" title="{{ user }}">
 <meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/templates/video.html b/templates/video.html
index d3fd3b3..69caec9 100644
--- a/templates/video.html
+++ b/templates/video.html
@@ -21,5 +21,5 @@
 <meta property="og:image" content="{{ pic }}" />
 <meta property="og:description" content="{{ desc }}" />
 
-<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlUserLink }}&ttype=video" type="application/json+oembed" title="{{ user }}">
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlUserLink }}&ttype=video&provider={{ appname }}" type="application/json+oembed" title="{{ user }}">
 <meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/twitfix.py b/twitfix.py
index 5e69610..ee1bd9e 100644
--- a/twitfix.py
+++ b/twitfix.py
@@ -59,7 +59,8 @@ def oembedend():
     user  = request.args.get("user", None)
     link  = request.args.get("link", None)
     ttype = request.args.get("ttype", None)
-    return  oEmbedGen(desc, user, link, ttype)
+    provName = request.args.get("provider",None)
+    return  oEmbedGen(desc, user, link, ttype,providerName=provName)
 
 @app.route('/<path:sub_path>') # Default endpoint used by everything
 def twitfix(sub_path):
@@ -376,12 +377,6 @@ def vnfFromCacheOrDL(video_link):
                 
             log.error("VNF Get failed: " + video_link + " " + log.get_exception_traceback_str(exErr))
             return None,exErr.msg
-        except TwitterHTTPError as twErr:
-            log.error("VNF Get failed: " + video_link + " " + log.get_exception_traceback_str(twErr))
-            if twErr.e.code == 404:
-                return None,msgs.tweetNotFound
-            else:
-                return None,None
         except Exception as e:
             log.error("VNF Get failed: " + video_link + " " + log.get_exception_traceback_str(e))
             return None,None
@@ -633,7 +628,7 @@ def embed(video_link, vnf, image):
             embedVNF=qrt
             if qrt['type'] == "Image":
                 if embedVNF['images'][4]!="1":
-                    appNamePost = " - Image " + str(image+1) + "/" + str(vnf['images'][4])
+                    appNamePost = " - Image " + str(image+1) + " of " + str(vnf['images'][4])
                 image = embedVNF['images'][image]
                 template = 'image.html'
             elif qrt['type'] == "Video" or qrt['type'] == "":
@@ -741,11 +736,13 @@ def tweetType(tweet): # Are we dealing with a Video, Image, or Text tweet?
     return out
 
 
-def oEmbedGen(description, user, video_link, ttype):
+def oEmbedGen(description, user, video_link, ttype,providerName=None):
+    if providerName == None:
+        providerName = config['config']['appname']
     out = {
             "type"          : ttype,
             "version"       : "1.0",
-            "provider_name" : config['config']['appname'],
+            "provider_name" : providerName,
             "provider_url"  : config['config']['repo'],
             "title"         : description,
             "author_name"   : user,