Fixed problems with comments.