deploy to heroku, some fixes