minor cleanups
updated JSON parser code
more work on the JSON parser