New data in json + some fixes

New JSON data
Some fixes for conditions (serialization bugs)