add some \todo from Nicolas