Fix Add JSON and minor clean up