fix some comments
add cancel message check