Merge remaining comments from andreas on PAPE