Various changes by Luis and me
New json files for all sources