review fixes, reformats etc.
add json support and test reformat