few minor changes and comments