added new json, updated data strucs, cleaned up entities in json