fix json + clean signature to minimize git conflicts