incorporated part of the changes from Jan, and editorial changes from Natascha