Cleanups + bug fixes.

Added label “JSON” above value.
Cleanups + bug fixes.