more _json changes
fixed lint issues