Fixed issues with comments.