minor updates to the json munger and data model