added handling of comments