new parsing of comments almost done