cleanup json
Bug corrections