A nice round of fixes and improvements to the CC mapper...