refine the comments, fix bug of parse message