Index: doc/papers/concurrency/AMA/AMA-stix/ama/WileyNJD-AMA.bst
===================================================================
--- doc/papers/concurrency/AMA/AMA-stix/ama/WileyNJD-AMA.bst	(revision cb5d36b56f5676f4fb62a476d54ef2eb8fe3933d)
+++ doc/papers/concurrency/AMA/AMA-stix/ama/WileyNJD-AMA.bst	(revision f810e0979506a9676292a2c51a6458b7f46e260c)
@@ -361,5 +361,5 @@
 { year empty$
     { "" }
-    { "" * year }
+    { " " * year }
   if$
 }
@@ -501,6 +501,6 @@
     { "In: " 
       editor empty$
-    'skip$
-    { " " * format.editors * " " * booktitle emphasize * ", " * }
+      { booktitle emphasize * }
+      { " " * format.editors * " " * booktitle emphasize * ", " * }
       if$
     }
@@ -819,6 +819,8 @@
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
+      blank.sep
       format.bvolume output
       format.number.series output
+      new.block
       format.pages output
       organization output
@@ -841,8 +843,8 @@
 { output.bibitem
   author empty$
-    { organization empty$
-    'skip$
-    { organization output.nonnull
-      address output
+    { new.block organization empty$
+    'skip$
+    { new.block organization output.nonnull
+      new.block address output
     }
       if$
@@ -852,6 +854,6 @@
   format.btitle "title" output.check
   author empty$
-    { organization empty$
-    { address new.block.checka
+    { new.block organization empty$
+    { new.block address new.block.checka
       address output
     }
@@ -859,10 +861,12 @@
       if$
     }
-    { organization address new.block.checkb
+    { new.block organization new.block address new.block.checkb
       organization output
       address output
     }
   if$
+  new.block
   format.edition output
+  new.block
   format.date output
   new.block
@@ -877,4 +881,5 @@
   blank.sep
   "Master's thesis" format.thesis.type output.nonnull
+  new.block
   school "school" output.check
   address output
@@ -907,6 +912,7 @@
   if$
   howpublished output
+  new.block
   format.note output 
-  %%new.block
+  new.block
   format.date output
   fin.entry