minor changes and major comments