JSON combine + minor changes