Fixed json errors

Need to validate