some more changes to the cpp version of 2013 1C/C