before activate Heroku
added fix settings for Heroku
fix bugs