Fixed up json output some.