Minor JSON changes
Manually merged JSON. Shouldn't be anything crazy...