modified: json array & object, better parsing