Finish up JSON revision

Finishes up JSON revision.