more json improvements