updates to json grammar parsing