small changes suggested by manuel