more json-related updates