Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision 49eb6a2332de13d116c1e1d70994bf6e76fd66c7)
+++ doc/papers/general/Makefile	(revision 53dece136b95eefe921b2b69d6297d7f2d0fa7c4)
@@ -34,4 +34,5 @@
 
 DOCUMENT = Paper.pdf
+BASE = ${basename ${DOCUMENT}}
 
 # Directives #
@@ -42,15 +43,15 @@
 
 clean :
-	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
+	@rm -frv ${DOCUMENT} ${BASE}.ps WileyNJD-AMA.bst ${BASE}.out.ps ${Build}
 
 # File Dependencies #
 
-${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${BASE}.ps
 	ps2pdf $<
 
-${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
-	dvips -h ${Build}/Paper.out.ps -o $@ ${Build}/$<
+${BASE}.ps : ${BASE}.dvi
+	dvips -o $@ ${Build}/$<
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
 		../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
@@ -67,4 +68,10 @@
 ${Build}:
 	mkdir -p ${Build}
+
+${BASE}.out.ps:
+	ln -s build/Paper.out.ps .
+
+WileyNJD-AMA.bst:
+	ln -s AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 
 ${GRAPHS} : timing.gp timing.dat
Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision 49eb6a2332de13d116c1e1d70994bf6e76fd66c7)
+++ doc/papers/general/Paper.tex	(revision 53dece136b95eefe921b2b69d6297d7f2d0fa7c4)
@@ -1,4 +1,3 @@
 \documentclass[AMA,STIX1COL]{WileyNJD-v2}
-%\documentclass{article}
 
 \articletype{RESEARCH ARTICLE}%
@@ -10,12 +9,12 @@
 \raggedbottom
 
-\usepackage{fullpage}
 \usepackage{epic,eepic}
-\usepackage{xspace,calc,comment}
+\usepackage{xspace}
+\usepackage{comment}
 \usepackage{upquote}						% switch curled `'" to straight
 \usepackage{listings}						% format program code
-\usepackage{enumitem}
-\setlist[itemize]{topsep=3pt,itemsep=2pt,parsep=0pt}% global
-\usepackage{rotating}
+%\usepackage{enumitem}
+%\setlist[itemize]{topsep=3pt,itemsep=2pt,parsep=0pt}% global
+%\usepackage{rotating}
 \definecolor{ForestGreen}{cmyk}{1, 0, 0.99995, 0}
 \hypersetup{breaklinks=true}
@@ -23,10 +22,4 @@
 \usepackage[pagewise]{lineno}
 \renewcommand{\linenumberfont}{\scriptsize\sffamily}
-
-\setlength{\topmargin}{-0.75in}\setlength{\headsep}{0.5in}\setlength{\footskip}{0.25in}
-\setlength{\textheight}{9.325in}
-\setlength{\textwidth}{6.75in}
-\setlength{\evensidemargin}{-0.25in}
-\setlength{\oddsidemargin}{-0.25in}
 
 \lefthyphenmin=4							% hyphen only after 4 characters
@@ -1708,5 +1701,5 @@
 as well, parameter names are optional, \eg:
 \begin{cfa}
-[ int x ] f ( /* void */ );		$\C[2in]{// returning int with no parameters}$
+[ int x ] f ( /* void */ );		$\C[2.5in]{// returning int with no parameters}$
 [ int x ] f (...);				$\C{// returning int with unknown parameters}$
 [ * int ] g ( int y );			$\C{// returning pointer to int with int parameter}$
@@ -2327,5 +2320,5 @@
 The following shows one example where \CFA \emph{extends} an existing standard C interface to reduce complexity and provide safety.
 C/\Celeven provide a number of complex and overlapping storage-management operation to support the following capabilities:
-\begin{description}[topsep=3pt,itemsep=2pt,parsep=0pt]
+\begin{description}%[topsep=3pt,itemsep=2pt,parsep=0pt]
 \item[fill]
 an allocation with a specified character.
@@ -2377,6 +2370,6 @@
 \end{cfa}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}	& \multicolumn{1}{c}{\textbf{C}}	\\
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}	& \multicolumn{1}{c}{\textbf{C}}	\\
 \begin{cfa}
 ip = alloc();