Fix comments
Fix small bugs and comment.