New data in json + some fixes