Some minor changes with debugging earlier and cleaned up code in jsonData

You may have to resolve some conflicts with the cleaning of code in JSONData