Fixed up the JSON generation