Fixed issues with some comments.