add -z; cleanup; reworking json objects