I'm going abroad for a few days on holiday, so I think I'll publish the new version tomorrow, even if it's incomplete, so that I can have some feedback when I return.