small changes suggested by Martin.