Play nicer with non-table output modules
Everything should now play nice together
And now JSON output is nice and readable