Update to include jan's, arjan's and marco's comments. Also format for blind review