some comments and changes