Index: doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst
===================================================================
--- doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst	(revision bc82faca3bc0290bb14dbb069ed47d51c5ccd327)
+++ doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst	(revision cfc3e0facc59b4b72c5c4ade00f35a2478f94cf2)
@@ -502,5 +502,5 @@
       editor empty$
       { booktitle emphasize * }
-      { " " * format.editors * " " * booktitle emphasize * ", " * }
+    { " " * format.editors * " " * booktitle emphasize * ", " * }
       if$
     }
@@ -691,4 +691,5 @@
     { format.journal emphasize "journal" output.check
       format.date add.semicolon "year" output.check
+      blank.sep
       format.volume output
       format.number output
@@ -824,5 +825,7 @@
       new.block
       format.pages output
+      new.block
       organization output
+      new.block
       publisher output
       inproformat.date "year" output.check
@@ -863,4 +866,5 @@
     { new.block organization new.block address new.block.checkb
       organization output
+      new.block
       address output
     }
@@ -883,4 +887,5 @@
   new.block
   school "school" output.check
+  new.block
   address output
   format.date "year" output.check
@@ -927,4 +932,5 @@
   "PhD thesis" format.thesis.type output.nonnull
   school "school" output.check
+  new.block
   address output
   format.date "year" output.check
Index: doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls
===================================================================
--- doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls	(revision bc82faca3bc0290bb14dbb069ed47d51c5ccd327)
+++ doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls	(revision cfc3e0facc59b4b72c5c4ade00f35a2478f94cf2)
@@ -484,6 +484,4 @@
 \if@STIXLargeOneCol%
 \RequirePackage[not1,notextcomp,lcgreekalpha]{stix}%
-%\usepackage[scaled]{helvet}
-%\renewcommand\familydefault{\sfdefault} 
 \usepackage[T1]{fontenc}
 \BXhsize=170mm%
@@ -528,9 +526,9 @@
 %\RequirePackage[not1,notextcomp,lcgreekalpha]{stix}%
 
-\captionsetup[figure]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf}
-\captionsetup[table]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf}
-\renewcommand{\thefigure}{\arabic{figure}}
-
-\renewcommand{\thetable}{\arabic{table}}
+\captionsetup[figure]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf}
+\captionsetup[table]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf}
+\renewcommand{\thefigure}{\arabic{figure}\enspace }
+
+\renewcommand{\thetable}{\arabic{table}\enspace }
 
 \renewcommand\figurename{\textbf{FIGURE}}%%
@@ -1414,7 +1412,7 @@
 \gdef\@stix@font@defn{%
   %
-%  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
+  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
   %
-%  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
+  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
   %
   \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}%
@@ -1429,5 +1427,5 @@
   \def\arttypefont{\rmfamily\fontsize{9}{9}\fontseries{b}\selectfont}%
   \def\SParttypefont{\rmfamily\fontsize{9}{12}\fontseries{b}\selectfont}%
-  \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
+  \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil\let\mathbcal\titmathbcal}%
   \def\subtitlefont{\rmfamily\fontsize{16}{21}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
   \def\Authorfont{\rmfamily\fontsize{12}{18}\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
@@ -1484,7 +1482,7 @@
 \gdef\@lato@font@defn{%
   %
-%  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
+  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
   %
-%  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
+  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
   %
   \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}%
@@ -3249,6 +3247,6 @@
     \fi
   \fi%
-  \renewcommand\thefigure{\@Alph\c@section\arabic{figure}}%
-  \renewcommand\thetable{\@Alph\c@section\arabic{table}}%
+  \renewcommand\thefigure{\@Alph\c@section\arabic{figure}\enspace }%
+  \renewcommand\thetable{\@Alph\c@section\arabic{table}\enspace }%
   \renewcommand\theequation{\@Alph\c@section\arabic{equation}}%
 }{%