JSON update and fixes.