More changes suggested by tialpoy.