Fixed json, added admin, fixed relationships