Most of the changes suggested by Holger