Add JSON and some tweaks