Added json field
Worked on supporting json3 based polyfill
More cleanups and fixes