json improvements