diff --git a/source/Plugins/AyaNova.Plugin.V8/Opt.cs b/source/Plugins/AyaNova.Plugin.V8/Opt.cs
index 0ced1cb..7a29183 100644
--- a/source/Plugins/AyaNova.Plugin.V8/Opt.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/Opt.cs
@@ -20,7 +20,7 @@ namespace AyaNova.PlugIn.V8
 
         private void btnOk_Click(object sender, EventArgs e)
         {
-
+            btnOk.Enabled = false;
             this.DialogResult = DialogResult.OK;
             this.Close();
 
diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 7c9e8fb..8d5cd3a 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -1379,13 +1379,13 @@ namespace AyaNova.PlugIn.V8
                 Tagit(c.RegionID, tags);
                 SetTags(d, tags);
 
-                d.serial = c.WorkorderService.ServiceNumber;
+              
                
-                var rMainObject = await util.PostAsync(RavenRouteName);
+                var rMainObject = await util.PostAsync(RavenRouteName, d.ToString());
                 long RavenId = util.IdFromResponse(rMainObject);
                 AddMap(c.ID, RavenId);
                 d = rMainObject.ObjectResponse["data"];
-
+                d.serial = c.WorkorderService.ServiceNumber;
 
                 //Attachments / FILES
                 await ExportAttachments(ObjectTID, progress, util.AyaType.WorkOrder);
@@ -1413,7 +1413,7 @@ namespace AyaNova.PlugIn.V8
                 }
 
                 //put the final object
-                await util.PutAsync(RavenRouteName + "/" + RavenId.ToString(), d.ToString());
+                await util.PutAsync(RavenRouteName, d.ToString());
                 //-----
 
                 //Event log fixup
@@ -1439,7 +1439,7 @@ namespace AyaNova.PlugIn.V8
 
                     dwi.notes = "Summary:\n" + wi.Summary + "TechNotes: \n" + wi.TechNotes;
 
-                    await util.PostAsync("workorders/items", d.ToString());
+                    await util.PostAsync("workorders/items", dwi.ToString());
 
                     //and rest of tree below here...