added json config + minor tweak