added json, cleaned up csv some