fix bitly and finish twilio