Minor tweaks before pulling ccat_corr
Think I've fixed the merge issue