fixed twilio and minor changes