fixed some bugs with comments.