Mostly JSON additions, but a few other tweaks