some changes and comments