fixed problems (Peter's) up to #25 in MB2EML testing log