store data as JSON object, small tweaks
Merge pull request #1 from gegere/updates/rewrite

store data as JSON object, small tweaks