Json output now keeps the comments