- added JSONhelper
- refactored a bit