Batch QC eps2-14

Detailed comments in the three individual commits.