- added missing data [match previous version of output]
- fixed bug in JSON output