few changes and comments