Bug fixes and adding trust in jsons