Fix bug and some modifications for comments.