now also showing json output
merge fix and made json beautiful