Made comments json compliant, added some issues