more changes and comments