Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision be039451f0e1354b7d3034be12fb5c81a8302973)
+++ doc/papers/general/Makefile	(revision 3fd3bda281e9d17219e179e725018410cd73629a)
@@ -51,5 +51,5 @@
 
 ${BASE}.ps : ${BASE}.dvi
-	dvips -o $@ ${Build}/$<
+	dvips ${Build}/$< -o $@
 
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
@@ -70,8 +70,8 @@
 
 ${BASE}.out.ps:
-	ln -s build/Paper.out.ps .
+	ln -fs build/Paper.out.ps .
 
 WileyNJD-AMA.bst:
-	ln -s AMA/AMA-stix/ama/WileyNJD-AMA.bst .
+	ln -fs AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 
 ${GRAPHS} : timing.gp timing.dat
Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision be039451f0e1354b7d3034be12fb5c81a8302973)
+++ doc/papers/general/Paper.tex	(revision 3fd3bda281e9d17219e179e725018410cd73629a)
@@ -8,4 +8,8 @@
 
 \raggedbottom
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Latex packages used in the document.
 
 \usepackage{epic,eepic}
@@ -17,6 +21,7 @@
 %\setlist[itemize]{topsep=3pt,itemsep=2pt,parsep=0pt}% global
 %\usepackage{rotating}
+
+\hypersetup{breaklinks=true}
 \definecolor{ForestGreen}{cmyk}{1, 0, 0.99995, 0}
-\hypersetup{breaklinks=true}
 
 \usepackage[pagewise]{lineno}
@@ -25,4 +30,6 @@
 \lefthyphenmin=4							% hyphen only after 4 characters
 \righthyphenmin=4
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Names used in the document.
@@ -96,9 +103,9 @@
         {\ETC.\xspace}%
 }%
-%\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
-%\newcommand*{\etal}{%
-%	\@ifnextchar{.}{\protect\ETAL}%
-%		{\protect\ETAL.\xspace}%
-%}%
+\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
+\renewcommand*{\etal}{%
+	\@ifnextchar{.}{\protect\ETAL}%
+		{\protect\ETAL.\xspace}%
+}%
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand*{\viz}{%
@@ -158,7 +165,7 @@
 {}
 
-
-\begin{document}
-\linenumbers                                            % comment out to turn off line numbering
+% inline code @...@
+\lstMakeShortInline@%
+
 
 \title{\texorpdfstring{\protect\CFA : Adding Modern Programming Language Features to C}{Cforall : Adding Modern Programming Language Features to C}}
@@ -170,10 +177,6 @@
 \address[1]{\orgdiv{David R. Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Ontario}, \country{Canada}}}
 
-%\corres{*Aaron Moss, \email{a3moss@uwaterloo.ca}}
-\corres{*Peter A. Buhr, \email{pabuhr@uwaterloo.ca}}
+\corres{*Peter A. Buhr, \email{pabuhr{\char`\@}uwaterloo.ca}}
 \presentaddress{David R. Cheriton School of Computer Science, University of Waterloo, Waterloo, ON, N2L 3G1, Canada}
-
-% inline code @...@
-\lstMakeShortInline@%
 
 
@@ -191,4 +194,8 @@
 
 \keywords{generic types, tuple types, variadic types, polymorphic functions, C, Cforall}
+
+
+\begin{document}
+\linenumbers                                            % comment out to turn off line numbering
 
 \maketitle