Index: doc/papers/general/Paper.tex
===================================================================
--- doc/papers/general/Paper.tex	(revision 3fd3bda281e9d17219e179e725018410cd73629a)
+++ doc/papers/general/Paper.tex	(revision 692afbb59b36b50a2feed53afe540aef5aea3ce0)
@@ -174,4 +174,5 @@
 \author[1]{Robert Schluntz}
 \author[1]{Peter A. Buhr*}
+\authormark{Aaron Moss \textsc{et al}}
 
 \address[1]{\orgdiv{David R. Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Ontario}, \country{Canada}}}
@@ -221,5 +222,5 @@
 Love it or hate it, C is extremely popular, highly used, and one of the few systems languages.
 In many cases, \CC is often used solely as a better C.
-Nonetheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
+Nevertheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
 
 \CFA (pronounced ``C-for-all'', and written \CFA or Cforall) is an evolutionary extension of the C programming language that aims to add modern language features to C while maintaining both source compatibility with C and a familiar programming model for programmers.
@@ -1028,5 +1029,5 @@
 \lstMakeShortInline@%
 \end{cquote}
-for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, because a space is required after a number, otherwise the period is a decimal point.}
+for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, as a space is required after a number, otherwise the first period is a decimal point.}
 \begin{cquote}
 \lstDeleteShortInline@%
@@ -1125,6 +1126,6 @@
 
 Finally, Figure~\ref{f:FallthroughStatement} shows @fallthrough@ may appear in contexts other than terminating a @case@ clause, and have an explicit transfer label allowing separate cases but common final-code for a set of cases.
-The target label must be below the @fallthrough@, \ie @fallthrough@ cannot form a loop, and the label may not be nested in a control structure, \ie it must be at the same level as the @case@ clauses;
-the target label may be case @default@.
+The target label must be below the @fallthrough@ and may not be nested in a control structure, \ie @fallthrough@ cannot form a loop, and the target label must be at the same or higher level as the containing @case@ clause and located at the same level as a @case@ clause;
+the target label may be case @default@, but only associated with the current @switch@/@choose@ statement.
 
 \begin{figure}
@@ -1161,6 +1162,4 @@
 \label{f:FallthroughStatement}
 \end{figure}
-
-Collectively, these control-structure enhancements reduce programmer burden and increase readability and safety.
 
 
@@ -1532,4 +1531,6 @@
 }
 \end{cfa}
+
+Collectively, these control-structure enhancements reduce programmer burden and increase readability and safety.