fixes

restructured json