update comments and some lines