diff --git a/plugin-loader.js b/plugin-loader.js
index 577f85d..bbf56a9 100644
--- a/plugin-loader.js
+++ b/plugin-loader.js
@@ -53,6 +53,6 @@ editor: function(div, entry, uneditable) {
     });
 },
 harvester: function(div) {
-    if(typeof plugin_save !== 'undefined') plugin_save(div);
+    if(typeof plugin_save !== 'undefined') return plugin_save(div);
 }
 }
diff --git a/plugin-server.py b/plugin-server.py
index 148f371..6731260 100644
--- a/plugin-server.py
+++ b/plugin-server.py
@@ -94,21 +94,20 @@ def plugin_file(plugin, path):
         redis.set(full_path + ":content", result)
         redis.set(full_path + ":etag", etag)
 
-    resp = Response(result, mimetype=mt)
-    resp.headers.add('Access-Control-Allow-Origin', '*')
-    resp.headers.add('ETag', etag)
+    # set headers
+    headers = {
+        'Access-Control-Allow-Origin': '*',
+        'ETag': etag
+    }
 
     # if browser does not have a cached etag -> 200
     if 'If-None-Match' not in request.headers:
-        resp.status_code = 200
+        status_code = 200
     # then check if it is the latest etag, else -> 200
     elif request.headers['If-None-Match'] != etag:
-        resp.status_code = 200
-    # else just set whatever was predetermined
-    else:
-        resp.status_code = status_code
+        status_code = 200
 
-    return resp
+    return Response(result, mimetype=mt, headers=headers, status=status_code)
 
 if __name__ == '__main__':
     app.run(host="0.0.0.0")