now working json output
merge conflict resolved
made json nice