Add support for commenting.
Fix bug in json dumping.