more fixes to Json Parser