merge most of the remaining comments from andreas on the PAPE section