various minor changes after test of 26/11/2013