small changes suggested by Michael