Concat update

Hi Jérôme! I've fixed a couple things you had forgotten and am happy with the current status of this branch. Any reason not to merge it? Cheers!