few changes following comments