Add json tags and make minor upgrades.