Heroku adapted & Twitter Fix