minor changes and comments