better parsing of comments