comments addressed and some more minor corrections