Fixed wrong and confusing comments in source codes.
Somehow the review comments are replaced to the correct place...