some comments and some changes