fixed comment-related bugs