few more tweaks on proper jsons