Updated comments in JSON code, updated CString to be more compliant.