CPC referee changes

Dear Ben,

this pull-request will merge all changes Lewis, Peter and me made to address the CPC referee comments.

Best,
Alex