Fixes to units, volumes and CN function