update comments and doc