Progres on Twilio
More Twilio fixes