Several changes suggested by Asgeir.