fixing heroku bugs