added market declarations to the json2rng script
changed master time grid to a single array
added control block comprehension