corrections from eftar meeting seems done, except in intro