edited few things so it can run on heroku