Fixing json output bug
Fixing bugs